From 8afe1981f6a9481338f2270a04ad8edc5e898fe3 Mon Sep 17 00:00:00 2001
From: afederici <ajf5@illinois.edu>
Date: Sat, 28 Nov 2020 03:34:55 -0600
Subject: [PATCH] try no blackout
---
Wc | Bin 191984 -> 191984 bytes
Wr | Bin 187392 -> 187392 bytes
src/Node.cpp | 4 ++--
src/main.cpp | 8 ++++----
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Wc b/Wc
index af8e05a01d108a9d344d8d8d7dff85b05958abdc..b97fb85333d44c3b4c24d5d375545de577c64974 100755
GIT binary patch
delta 74
zcmV-Q0JZ<{+Y9j93xKo%XnF#p8MkVB0nRo8q#3t5u>lvj4q`bqFfcYQZvbCyVQFrc
gU<(2=w*&?Pr~<b+YyyQj1~@e^G-GAA#H9i(NDrVHTmS$7
delta 74
zcmexxoBP9U?uIRl8C6Vs#kXfwF`hF6F|0N+itpevvM@?APu9z4h|f*T%$uIT&1AHl
dg^g(i({{@ordCU~MDxTXgS72OmNMyh001RC8WjKl
diff --git a/Wr b/Wr
index 243b5fd8c9bd43df9608d8f235b2cd1b7f99abc8..96a8a8ed2eadba551b1db2e7baf9ebe5b101e8c0 100755
GIT binary patch
delta 61
zcmZqJ!QB8vTNpDcnU+Xy&#GkfGh|vSxqa6v#yOi<Q&W;mQnp9OGL@Tgq?j2cSz7Al
QPrvt?F>JfR6s8OA0L-Qr761SM
delta 61
zcmZqJ!QB8vTNpDcnf8fq&#GkfGXybqtzw+BiPgl=$kJ$gbSzW38Hb6vSxSnzUjFoZ
OuNlL(8%$xk;0^%378Zm6
diff --git a/src/Node.cpp b/src/Node.cpp
index 6bc4d0d..8b3b96e 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 3f68acc..a6ef2d2 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 {
--
GitLab