Skip to content

Commit 4707171

Browse files
javemejaveme
committed
fix test error
Change-Id: Ida99827b1532a00b0167da8858be1bffbb22a9cd
1 parent 3541132 commit 4707171

File tree

4 files changed

+27
-20
lines changed

4 files changed

+27
-20
lines changed

‎hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ public BackendFeatures backendStoreFeatures() {
249249

250250
@Override
251251
public void serverStarted(Id serverId, NodeRole serverRole) {
252-
LOG.info("Init server info for graph '{}'...", this.name);
252+
LOG.info("Init server info [{}-{}] for graph '{}'...",
253+
serverId, serverRole, this.name);
253254
this.serverInfoManager().initServerInfo(serverId, serverRole);
254255

255256
LOG.info("Restoring incomplete tasks for graph '{}'...", this.name);

‎hugegraph-core/src/main/java/com/baidu/hugegraph/task/ServerInfoManager.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ public synchronized void initServerInfo(Id server, NodeRole role) {
163163
HugeServerInfo serverInfo = new HugeServerInfo(server, role);
164164
serverInfo.maxLoad(this.calcMaxLoad());
165165
this.save(serverInfo);
166+
167+
LOG.info("Init server info: {}", serverInfo);
166168
}
167169

168170
public Id selfServerId() {
@@ -191,14 +193,11 @@ public void heartbeat() {
191193
this.save(serverInfo);
192194
}
193195

194-
public void decreaseLoad(int load) {
195-
try {
196-
HugeServerInfo serverInfo = this.selfServerInfo();
197-
serverInfo.increaseLoad(-load);
198-
this.save(serverInfo);
199-
} catch (Throwable t) {
200-
LOG.error("Exception occurred when decrease server load", t);
201-
}
196+
public synchronized void decreaseLoad(int load) {
197+
assert load > 0 : load;
198+
HugeServerInfo serverInfo = this.selfServerInfo();
199+
serverInfo.increaseLoad(-load);
200+
this.save(serverInfo);
202201
}
203202

204203
public int calcMaxLoad() {
@@ -345,6 +344,7 @@ private HugeServerInfo removeServerInfo(Id server) {
345344
if (server == null) {
346345
return null;
347346
}
347+
LOG.info("Remove server info: {}", server);
348348
return this.call(() -> {
349349
Iterator<Vertex> vertices = this.tx().queryVertices(server);
350350
Vertex vertex = QueryResults.one(vertices);
@@ -356,11 +356,11 @@ private HugeServerInfo removeServerInfo(Id server) {
356356
});
357357
}
358358

359-
public void updateServerInfos(Collection<HugeServerInfo> serverInfos) {
359+
protected void updateServerInfos(Collection<HugeServerInfo> serverInfos) {
360360
this.save(serverInfos);
361361
}
362362

363-
public Collection<HugeServerInfo> allServerInfos() {
363+
protected Collection<HugeServerInfo> allServerInfos() {
364364
Iterator<HugeServerInfo> infos = this.serverInfos(NO_LIMIT, null);
365365
try (ListIterator<HugeServerInfo> iter = new ListIterator<>(
366366
MAX_SERVERS, infos)) {
@@ -370,11 +370,11 @@ public Collection<HugeServerInfo> allServerInfos() {
370370
}
371371
}
372372

373-
public Iterator<HugeServerInfo> serverInfos(String page) {
373+
protected Iterator<HugeServerInfo> serverInfos(String page) {
374374
return this.serverInfos(ImmutableMap.of(), PAGE_SIZE, page);
375375
}
376376

377-
public Iterator<HugeServerInfo> serverInfos(long limit, String page) {
377+
protected Iterator<HugeServerInfo> serverInfos(long limit, String page) {
378378
return this.serverInfos(ImmutableMap.of(), limit, page);
379379
}
380380

‎hugegraph-core/src/main/java/com/baidu/hugegraph/task/StandardTaskScheduler.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,14 @@ protected void cancelTasksOnWorker(Id server) {
444444
protected void taskDone(HugeTask<?> task) {
445445
this.remove(task);
446446

447-
this.serverManager().decreaseLoad(task.load());
448-
449-
LOG.debug("Task '{}' done on server '{}'",
450-
task.id(), this.serverManager().selfServerId());
447+
Id selfServerId = this.serverManager().selfServerId();
448+
try {
449+
this.serverManager().decreaseLoad(task.load());
450+
} catch (Throwable e) {
451+
LOG.error("Failed to decrease load for task '{}' on server '{}'",
452+
task.id(), selfServerId, e);
453+
}
454+
LOG.debug("Task '{}' done on server '{}'", task.id(), selfServerId);
451455
}
452456

453457
protected void remove(HugeTask<?> task) {

‎hugegraph-test/src/main/java/com/baidu/hugegraph/core/MultiGraphsTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ public void testCopySchemaWithMultiGraphs() {
7373
graph.initBackend();
7474
}
7575
HugeGraph g1 = graphs.get(0);
76-
g1.serverStarted(IdGenerator.of("server2"), NodeRole.MASTER);
76+
g1.serverStarted(IdGenerator.of("server-g2"), NodeRole.MASTER);
7777
HugeGraph g2 = graphs.get(1);
78-
g2.serverStarted(IdGenerator.of("server3"), NodeRole.MASTER);
78+
g2.serverStarted(IdGenerator.of("server-g3"), NodeRole.MASTER);
7979

8080
SchemaManager schema = g1.schema();
8181

@@ -192,10 +192,11 @@ public void testCopySchemaWithMultiGraphsWithConflict() {
192192
List<HugeGraph> graphs = openGraphs("schema_g1", "schema_g2");
193193
for (HugeGraph graph : graphs) {
194194
graph.initBackend();
195-
graph.serverStarted(IdGenerator.of("server1"), NodeRole.MASTER);
196195
}
197196
HugeGraph g1 = graphs.get(0);
198197
HugeGraph g2 = graphs.get(1);
198+
g1.serverStarted(IdGenerator.of("server-g1c"), NodeRole.MASTER);
199+
g2.serverStarted(IdGenerator.of("server-g2c"), NodeRole.MASTER);
199200

200201
g1.schema().propertyKey("id").asInt().create();
201202
g2.schema().propertyKey("id").asText().create();
@@ -392,6 +393,7 @@ private static Configuration buildConfig(String graphName) {
392393
String walPath = config.getString(RocksDBOptions.WAL_PATH.name());
393394
config.setProperty(RocksDBOptions.WAL_PATH.name(),
394395
Paths.get(walPath, graphName).toString());
396+
395397
return config;
396398
}
397399
}

0 commit comments

Comments
 (0)