Merge pull request #134 from h0tbird/restart_from_scratch

Attempt to get the most recent monmap
ceph · Jul 22, 2015 · d91137d · d91137d
2 parents 1d0551b + 7844508
commit d91137d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/daemon/config.kv.sh b/daemon/config.kv.sh
@@ -42,7 +42,13 @@ function get_mon_config {
     if [ ! -f /etc/ceph/monmap ]; then
       echo "Monmap is missing. Adding initial monmap..."
       kviator --kvstore=${KV_TYPE} --client=${KV_IP}:${KV_PORT} get ${CLUSTER_PATH}/monmap > /etc/ceph/monmap
-      ceph mon getmap -o /etc/ceph/monmap
+    fi
+
+    echo "Trying to get the most recent monmap..."
+    if timeout 5 ceph ${CEPH_OPTS} mon getmap -o /etc/ceph/monmap; then
+      echo "Monmap successfully retrieved."
+    else
+      echo "Peers not found, using initial monmap."
     fi
 
   else