From 7c209632480a7e73cb1243f2afb6d1ba1784efb3 Mon Sep 17 00:00:00 2001 From: thevindu-w Date: Sat, 27 Jan 2024 16:19:00 +0530 Subject: [PATCH] Use /var/tmp/jasminegraph/logs as log path --- src/server/JasmineGraphInstanceService.cpp | 9 ++++----- src/server/JasmineGraphServer.cpp | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/server/JasmineGraphInstanceService.cpp b/src/server/JasmineGraphInstanceService.cpp index e0c399213..8d713d911 100644 --- a/src/server/JasmineGraphInstanceService.cpp +++ b/src/server/JasmineGraphInstanceService.cpp @@ -952,9 +952,8 @@ void JasmineGraphInstanceService::trainPartition(string trainData) { std::transform(trainargs.begin(), trainargs.end(), std::back_inserter(vc), converter); std::string path = "cd " + Utils::getJasmineGraphProperty("org.jasminegraph.graphsage") + " && "; - std::string command = - path + "python3 -m unsupervised_train > /home/ubuntu/software/jasminegraph/logs/unsupervised_train" + - partitionID + "-" + Utils::getCurrentTimestamp() + ".txt"; + std::string command = path + "python3 -m unsupervised_train > /var/tmp/jasminegraph/logs/unsupervised_train" + + partitionID + "-" + Utils::getCurrentTimestamp() + ".txt"; int argc = trainargs.size(); for (int i = 0; i < argc - 2; ++i) { @@ -1946,7 +1945,7 @@ void JasmineGraphInstanceService::initOrgServer(string trainData) { std::string command = path + "python3 org_server.py " + graphID + " " + Utils::getJasmineGraphProperty("org.jasminegraph.fl_clients") + " " + Utils::getJasmineGraphProperty("org.jasminegraph.fl.epochs") + - " localhost 5050 > /home/ubuntu/software/jasminegraph/logs/org_server_logs-" + + " localhost 5050 > /var/tmp/jasminegraph/logs/org_server_logs-" + Utils::getCurrentTimestamp() + ".txt"; instance_logger.info("Executing : " + command); int exit_status = system(command.c_str()); @@ -1976,7 +1975,7 @@ void JasmineGraphInstanceService::initAgg(string trainData) { Utils::getJasmineGraphProperty("org.jasminegraph.fl.dataDir") + " " + "4" + " 0 " + Utils::getJasmineGraphProperty("org.jasminegraph.fl.num.orgs") + " " + Utils::getJasmineGraphProperty("org.jasminegraph.fl.epochs") + " localhost 5000 > " + - "/home/ubuntu/software/jasminegraph/logs/agg_logs-" + Utils::getCurrentTimestamp() + ".txt"; + "/var/tmp/jasminegraph/logs/agg_logs-" + Utils::getCurrentTimestamp() + ".txt"; instance_logger.info("Executing : " + command); int exit_status = system(command.c_str()); if (exit_status == -1) { diff --git a/src/server/JasmineGraphServer.cpp b/src/server/JasmineGraphServer.cpp index 77866106f..00a55c3e5 100644 --- a/src/server/JasmineGraphServer.cpp +++ b/src/server/JasmineGraphServer.cpp @@ -427,7 +427,7 @@ void JasmineGraphServer::startRemoteWorkers(std::vector workerPortsVector, "docker run -v " + instanceDataFolder + ":" + instanceDataFolder + " -v " + aggregateDataFolder + ":" + aggregateDataFolder + " -v " + nmonFileLocation + ":" + nmonFileLocation + " -v " + instanceDataFolder + "/" + to_string(i) + "/logs" + ":" + - "/home/ubuntu/software/jasminegraph/logs" + " -p " + std::to_string(workerPortsVector.at(i)) + + "/var/tmp/jasminegraph/logs" + " -p " + std::to_string(workerPortsVector.at(i)) + ":" + std::to_string(workerPortsVector.at(i)) + " -p " + std::to_string(workerDataPortsVector.at(i)) + ":" + std::to_string(workerDataPortsVector.at(i)) + " -e WORKER_ID=" + to_string(i) + @@ -450,7 +450,7 @@ void JasmineGraphServer::startRemoteWorkers(std::vector workerPortsVector, "docker -H ssh://" + host + " run -v " + instanceDataFolder + ":" + instanceDataFolder + " -v " + aggregateDataFolder + ":" + aggregateDataFolder + " -v " + nmonFileLocation + ":" + nmonFileLocation + " -v " + instanceDataFolder + "/" + to_string(i) + "/logs" + ":" + - "/home/ubuntu/software/jasminegraph/logs" + " -p " + std::to_string(workerPortsVector.at(i)) + + "/var/tmp/jasminegraph/logs" + " -p " + std::to_string(workerPortsVector.at(i)) + ":" + std::to_string(workerPortsVector.at(i)) + " -p " + std::to_string(workerDataPortsVector.at(i)) + ":" + std::to_string(workerDataPortsVector.at(i)) + " -e WORKER_ID=" + to_string(i) +