From fd0f5b0a9b08cb00744e6040e1f4270100dd48e9 Mon Sep 17 00:00:00 2001
From: Armin Friedl <armin.friedl@outlook.com>
Date: Sun, 12 May 2019 13:06:49 +0200
Subject: [PATCH] Final commit

---
 bfclient/src/bfclient.cpp                     |  2 +-
 btadmin                                       |  2 +-
 cnc/src/main/java/org/btcollider/cnc/CnC.java |  4 ++-
 .../cnc/keysrv/keytree/KeyTreeServer.java     | 33 ++++++++++++++++++-
 .../keysrv/multistage/MultiStagedServer.java  |  5 ++-
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/bfclient/src/bfclient.cpp b/bfclient/src/bfclient.cpp
index fdb20c8..89b0f7f 100644
--- a/bfclient/src/bfclient.cpp
+++ b/bfclient/src/bfclient.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #define BATCH_MAX 4096
 
 int main(int argc, char** argv) {
-  util::bytestr key("db53d9bbd1f3a83b094eeca7dd970bd85b492fa2");
+  util::bytestr key("9e42601eeaedc244e15f17375adb0e2cd08efdc9");
 
   if (argc < 4) {
     cout << "Invalid argument count" << endl;
diff --git a/btadmin b/btadmin
index f5ac13f..0809d4c 100755
--- a/btadmin
+++ b/btadmin
@@ -2,7 +2,7 @@
 
 case $1 in
 	cnc)
-		setsid scp /home/armin/dev/btcollider/cnc/CnC/cnc.jar btcollider:~
+		scp /home/armin/dev/btcollider/cnc/CnC/cnc.jar btcollider:~
 		;;
 	doc)
 		cd docker && make
diff --git a/cnc/src/main/java/org/btcollider/cnc/CnC.java b/cnc/src/main/java/org/btcollider/cnc/CnC.java
index a1ef2f0..4d6c6fc 100644
--- a/cnc/src/main/java/org/btcollider/cnc/CnC.java
+++ b/cnc/src/main/java/org/btcollider/cnc/CnC.java
@@ -24,6 +24,8 @@ public class CnC {
   public static final int MAX_BITS = 62;
 
   public static void main(String[] args) {
+    log.info("Version 2.1");
+
     if (args.length < 2 || args.length > 3) {
       System.out
           .println("USAGE: java -jar cnc.jar <succFile Path> <dumpFile Path> [loadDump Path]");
@@ -33,7 +35,7 @@ public class CnC {
     String succFile = args[0];
     String dumpFile = args[1];
 
-    KeyServer kts = KSFactory.build(54, 30, 90, TimeUnit.MINUTES, 0.65f);
+    KeyServer kts = KSFactory.build(31, 26, 90, TimeUnit.MINUTES, 0.65f);
     if (args.length == 3) {
       log.info("Undumping from {}", args[2]);
       try (InputStream is = new FileInputStream(args[2])) {
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
index 63807ab..325e3f9 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
@@ -22,6 +22,7 @@ public class KeyTreeServer implements KeyServer {
   private KeyTree root;
   private int index;
   private int depth;
+  private ScheduledExecutorService es;
 
   public KeyTreeServer(int index, int depth, long maxWorkSpan, long pruneKey) {
     assert Math.pow(2, CnC.MAX_BITS) <= Long.MAX_VALUE;
@@ -37,7 +38,7 @@ public class KeyTreeServer implements KeyServer {
     if (maxWorkSpan > 0) {
       log.info("Starting KeyTree concierge with timeout {}s",
           TimeUnit.MILLISECONDS.toSeconds(maxWorkSpan));
-      ScheduledExecutorService es = Executors.newSingleThreadScheduledExecutor();
+      es = Executors.newSingleThreadScheduledExecutor();
       es.scheduleWithFixedDelay(new KTConcierge(root, maxWorkSpan), 0, 30, TimeUnit.SECONDS);
     } else {
       log.info("KeyTree concierge disabled");
@@ -355,4 +356,34 @@ public class KeyTreeServer implements KeyServer {
     recUndump(node.getLeft(), in);
     recUndump(node.getRight(), in);
   }
+
+  public void shutDown() {
+    es.shutdown();
+
+    try {
+      if (!es.awaitTermination(1, TimeUnit.MINUTES)) {
+        log.warn("KeyTree concierge didn't shutdown properly");
+      }
+    } catch (InterruptedException e) {
+      log.warn("Interrupted while trying to shutdown KeyTree concierge", e);
+    } finally {
+      if (!es.isTerminated()) {
+        log.warn("KeyTree concierge tasks haven't terminated properly. Trying to force shutdown.");
+        es.shutdownNow();
+
+        try {
+          if (!es.awaitTermination(1, TimeUnit.MINUTES)) {
+            log.warn("Forced concierge shutdown failed");
+          }
+        } catch (InterruptedException e) {
+          log.warn("Forced concierge shutdown interrupted", e);
+        } finally {
+          log.warn("KeyTree concierge couldn't be shut down");
+        }
+
+      } else {
+        log.debug("KeyTree concierge shut down");
+      }
+    }
+  }
 }
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
index 3317c54..fafef90 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
@@ -49,7 +49,10 @@ public class MultiStagedServer implements KeyServer {
     // This represents the actual work-horse KeyTreeServer for the current partition with
     // enabled KTConcierge service.
     // Needs subindex+1 because starting bit always set to 1
-    long subPrune = ((long) 1 << subIndex + 1) | ((((long) 1 << subIndex + 1) - 1) & pruneKey);
+
+    // Can't use subPrune because it's only valid in the first partition, but partitions are random
+    long subPrune = 0;
+    // long subPrune = ((long) 1 << subIndex + 1) | ((((long) 1 << subIndex + 1) - 1) & pruneKey);
     this.secKTS = new KeyTreeServer(subIndex + 1, remainingDepth, maxWorkSpan, subPrune);
 
     this.keyRangeBuffer = new KeyRangeBuffer(maxWorkSpan);