diff --git a/Wc b/Wc index af8e05a01d108a9d344d8d8d7dff85b05958abdc..b97fb85333d44c3b4c24d5d375545de577c64974 100755 Binary files a/Wc and b/Wc differ diff --git a/Wr b/Wr index 243b5fd8c9bd43df9608d8f235b2cd1b7f99abc8..96a8a8ed2eadba551b1db2e7baf9ebe5b101e8c0 100755 Binary files a/Wr and b/Wr differ diff --git a/src/Node.cpp b/src/Node.cpp index 6bc4d0de2e5504f62424919291f1313cfa52e18e..8b3b96e4a6feefcbad8a1db3804bd73d435d61aa 100644 --- a/src/Node.cpp +++ b/src/Node.cpp @@ -838,7 +838,7 @@ void Node::replicateKeys(){ void Node::handleMaplejuiceQ(){ - if (!maplejuiceQ.empty() && !workerRing->size() && !isBlackout){ + if (!maplejuiceQ.empty() && !workerRing->size()){ string msgCopy(maplejuiceQ.front()); cout << "[QUEUE] sending next maple/juice to be processed " << msgCopy << endl; tcpServent->regMessages.push(msgCopy); @@ -999,7 +999,7 @@ void Node::handleTcpMessage() if (!workerProcessing.size()) { cout <<"[JUICEACK] replicate final results " << endl; Messages outMsg(DNS, nodeInformation.ip + "::" + to_string(hashRingPosition) + "::" + sdfsOut + "::" + sdfsOut + "::" + "-1" + "::" + "-1" + "::"); - tcpServent->regMessages.push(outMsg.toString()); + operationQ.push(outMsg.toString()); if (maplejuiceClear){ cout << "[JUICEACK] clearing files.... "; for (auto &f : fileList){ diff --git a/src/main.cpp b/src/main.cpp index 3f68acc6413a0cb9a8fb1cca993ed74d55f4586f..a6ef2d20142a876498e498d70f59b051c7c4d713 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -200,7 +200,7 @@ int main(int argc, char *argv[]) cout << "[JUICE] " << cmdLineInput[1] << " does not exist locally" << endl; continue; } - if (!node->isBlackout){ + //if (!node->isBlackout){ string msg = cmdLineInput[1] + "::" + cmdLineInput[2] + "::" + cmdLineInput[3] + "::" + cmdLineInput[4]; msg += ("::" + cmdLineInput[5] + "::" + cmdLineInput[6]); try { @@ -213,9 +213,9 @@ int main(int argc, char *argv[]) Messages outMsg(JUICESTART, msg); cout << "[JUICE] forwarding " << outMsg.toString() << " to " << node->leaderIP << endl; node->tcpServent->sendMessage(node->leaderIP, TCPPORT, outMsg.toString()); - } else { - cout << "[BLACKOUT] Leader cannot accept the request" << endl; - } + //} else { + // cout << "[BLACKOUT] Leader cannot accept the request" << endl; + //} } else if (cmd == "leader"){ cout << "Leader IP " << node->leaderIP << endl; } else {