mgr/MgrClient: do not assert on control-c

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/CommandTable.h b/src/common/CommandTable.h
index 6aab1b8c24b1ba37f203776ff3c32c1d2316d11c..e952ebe2f27895ebef745056b44a1056e4d89f9f 100644 (file)
--- a/src/common/CommandTable.h
+++ b/src/common/CommandTable.h
@@ -93,6 +93,10 @@ public:
   {
     commands.erase(tid);
   }
+
+  void clear() {
+    commands.clear();
+  }
 };
 
 #endif

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index cb5a39ade64bd97bff935a0a16a7999314f4ea77..1defc2c9f0a3aae8a47862147a360aebb3a34261 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -49,6 +49,10 @@ void MgrClient::shutdown()
 {
   Mutex::Locker l(lock);
 
+  // forget about in-flight commands if we are prematurely shut down
+  // (e.g., by control-C)
+  command_table.clear();
+
   timer.shutdown();
   session.reset();
 }