tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix distributed startup and QA test

Browse Source 
Reviewers: msantl, teon.banek

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1674
This commit is contained in:
Matej Ferencevic 2018-10-18 09:44:04 +02:00
parent 93267531be
commit 9a7d25f6a5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/memgraph_distributed.cpp
View File

@ -98,12 +98,12 @@ void MasterMain() {
InitSignalHandlers(shutdown); InitSignalHandlers(shutdown);
// Start the Bolt server.
CHECK(server.Start()) << "Couldn't start the Bolt server!";
// Start the database. // Start the database.
db.Start(); db.Start();
// Start the Bolt server.
CHECK(server.Start()) << "Couldn't start the Bolt server!";
// The return code of `AwaitShutdown` is ignored because we want the database // The return code of `AwaitShutdown` is ignored because we want the database
// to exit cleanly no matter what. // to exit cleanly no matter what.
db.AwaitShutdown([&server] { db.AwaitShutdown([&server] {

9
tests/qa/tck_engine/environment.py
View File

@ -22,8 +22,9 @@ COMMON_FLAGS = ["--durability-enabled=false",
DISTRIBUTED_FLAGS = ["--num-workers", str(6), DISTRIBUTED_FLAGS = ["--num-workers", str(6),
"--rpc-num-client-workers", str(6), "--rpc-num-client-workers", str(6),
"--rpc-num-server-workers", str(6)] "--rpc-num-server-workers", str(6)]
MASTER_PORT = 10000
MASTER_FLAGS = ["--master", MASTER_FLAGS = ["--master",
"--master-port", "10000"] "--master-port", str(MASTER_PORT)]
MEMGRAPH_PORT = 7687 MEMGRAPH_PORT = 7687
# Module-scoped variables # Module-scoped variables
@ -63,7 +64,7 @@ def get_worker_flags(worker_id):
def wait_for_server(port, delay=0.01): def wait_for_server(port, delay=0.01):
cmd = ["nc", "-z", "-w", "1", "127.0.0.1", port] cmd = ["nc", "-z", "-w", "1", "127.0.0.1", str(port)]
count = 0 count = 0
while subprocess.call(cmd) != 0: while subprocess.call(cmd) != 0:
time.sleep(0.01) time.sleep(0.01)
@ -94,12 +95,14 @@ def start_memgraph(context):
temporary_directory.name, "master")) temporary_directory.name, "master"))
run_memgraph(context, master_flags + DISTRIBUTED_FLAGS + MASTER_FLAGS, run_memgraph(context, master_flags + DISTRIBUTED_FLAGS + MASTER_FLAGS,
context.config.distributed) context.config.distributed)
wait_for_server(MASTER_PORT, 0.5)
for i in range(1, int(context.config.num_machines)): for i in range(1, int(context.config.num_machines)):
worker_flags = flags.copy() worker_flags = flags.copy()
worker_flags.append("--durability-directory=" + os.path.join( worker_flags.append("--durability-directory=" + os.path.join(
temporary_directory.name, "worker" + str(i))) temporary_directory.name, "worker" + str(i)))
run_memgraph(context, worker_flags + DISTRIBUTED_FLAGS + run_memgraph(context, worker_flags + DISTRIBUTED_FLAGS +
get_worker_flags(i), context.config.distributed) get_worker_flags(i), context.config.distributed)
wait_for_server(MASTER_PORT + i, 0.5)
else: # Run single machine memgraph else: # Run single machine memgraph
flags = COMMON_FLAGS.copy() flags = COMMON_FLAGS.copy()
if context.config.memgraph_params: if context.config.memgraph_params:
@ -107,7 +110,7 @@ def start_memgraph(context):
flags.append("--durability-directory=" + temporary_directory.name) flags.append("--durability-directory=" + temporary_directory.name)
run_memgraph(context, flags, context.config.distributed) run_memgraph(context, flags, context.config.distributed)
assert is_tested_system_active(context), "Failed to start memgraph" assert is_tested_system_active(context), "Failed to start memgraph"
wait_for_server(str(MEMGRAPH_PORT)) # wait for memgraph to start wait_for_server(MEMGRAPH_PORT, 0.5) # wait for memgraph to start
def cleanup(context): def cleanup(context):