Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug fix/fix shard state restore display (#3385) 

* don't add  items into the array if we have an empty list member.

* we mustn't display 100% here, since its a rounding error. If, the checkmark would be set.

* rather use string cutting to round so we don't get into the 100% trap.
This commit is contained in:
Wilfried Goesgens 2017-10-17 14:08:07 +02:00 committed by Jan
parent 9358cc0b8e
commit 88fd685296
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Cluster/v8-cluster.cpp
View File

@ -656,7 +656,7 @@ static void JS_GetCollectionInfoClusterInfo(
for (auto const& p : VPackObjectIterator(shards)) {
TRI_ASSERT(p.value.isArray());
v8::Handle<v8::Array> shorts =
v8::Array::New(isolate, static_cast<int>(p.value.length()));
v8::Array::New(isolate);
uint32_t pos = 0;
for (auto const& s : VPackArrayIterator(p.value)) {
try {
@ -664,7 +664,8 @@ static void JS_GetCollectionInfoClusterInfo(
if (t.at(0) == '_') {
t = t.substr(1);
}
shorts->Set(pos++, TRI_V8_STD_STRING(isolate, serverAliases.at(t)));
shorts->Set(pos, TRI_V8_STD_STRING(isolate, serverAliases.at(t)));
pos++;
} catch (...) {}
}
shardShorts->Set(TRI_V8_STD_STRING(isolate, p.key.copyString()), shorts);
@ -729,14 +730,15 @@ static void JS_GetCollectionInfoCurrentClusterInfo(
v8::Handle<v8::Array> list =
v8::Array::New(isolate, static_cast<int>(servers.size()));
v8::Handle<v8::Array> shorts =
v8::Array::New(isolate, static_cast<int>(servers.size()));
v8::Array::New(isolate);
auto serverAliases = ClusterInfo::instance()->getServerAliases();
uint32_t pos = 0;
for (auto const& s : servers) {
try {
shorts->Set(pos, TRI_V8_STD_STRING(isolate, serverAliases.at(s)));
} catch (...) {}
list->Set(pos++, TRI_V8_STD_STRING(isolate, s));
list->Set(pos, TRI_V8_STD_STRING(isolate, s));
pos++;
}
result->Set(TRI_V8_ASCII_STRING(isolate, "servers"), list);
result->Set(TRI_V8_ASCII_STRING(isolate, "shorts"), shorts);

2
js/apps/system/_admin/aardvark/APP/frontend/js/templates/shardsView.ejs
View File

@ -86,7 +86,7 @@
<% if (shard.progress.total === 0) { %>
<% percent = numeral(0).format('0.00%'); %>
<% } else { %>
<% percent = numeral(shard.progress.current / shard.progress.total).format('0.00%'); %>
<% percent = (shard.progress.current / shard.progress.total * 100).toString().match(/^-?\d+(?:\.\d{0,2})?/)[0] + '%'; %>
<% } %>
<div class="<%= genClass1 %> left"><%= percent %></div>
<% } else { %>