Merge pull request #22 from alram/wip-mon-fix

mon: make ceph-mon-check the exclusive monmap maintainer
ceph · Oct 26, 2017 · 547dff5 · 547dff5
2 parents b67662c + 939a9fc
commit 547dff5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/ceph/ceph/templates/bin/_check_zombie_mons.py.tpl b/ceph/ceph/templates/bin/_check_zombie_mons.py.tpl
@@ -5,11 +5,11 @@ import subprocess
 import json
 
 MON_REGEX = r"^\d: ([0-9\.]*):\d+/\d* mon.([^ ]*)$"
-# kubctl_command = 'kubectl get pods --namespace=${NAMESPACE} -l component=mon -l application=ceph -o template --template="{ {{"}}"}}range .items{{"}}"}} \\"{{"}}"}}.metadata.name{{"}}"}}\\": \\"{{"}}"}}.status.podIP{{"}}"}}\\" ,   {{"}}"}}end{{"}}"}} }"'
+# kubctl_command = 'kubectl get pods --namespace=${NAMESPACE} -l application=ceph,component=mon -o template --template="{ {{"}}"}}range .items{{"{{"}} \\"{{"{{"}}.metadata.name{{"}}"}}\\": \\"{{"{{"}}.status.podIP{{"}}"}}\\" ,   {{"{{"}}end{{"}}"}} }"'
 if int(os.getenv('K8S_HOST_NETWORK', 0)) > 0:
-    kubectl_command = 'kubectl get pods --namespace=${NAMESPACE} -l component=mon -l application=ceph -o template --template="{ {{"}}"}}range  \$i, \$v  := .items{{"}}"}} {{"}}"}} if \$i{{"}}"}} , {{"}}"}} end {{"}}"}} \\"{{"}}"}}\$v.spec.nodeName{{"}}"}}\\": \\"{{"}}"}}\$v.status.podIP{{"}}"}}\\" {{"}}"}}end{{"}}"}} }"'
+    kubectl_command = 'kubectl get pods --namespace=${NAMESPACE} -l application=ceph,component=mon -o template --template="{ {{"{{"}}range  \$i, \$v  := .items{{"}}"}} {{"{{"}} if \$i{{"}}"}} , {{"{{"}} end {{"}}"}} \\"{{"{{"}}\$v.spec.nodeName{{"}}"}}\\": \\"{{"{{"}}\$v.status.podIP{{"}}"}}\\" {{"{{"}}end{{"}}"}} }"'
 else:
-    kubectl_command = 'kubectl get pods --namespace=${NAMESPACE} -l component=mon -l application=ceph -o template --template="{ {{"}}"}}range  \$i, \$v  := .items{{"}}"}} {{"}}"}} if \$i{{"}}"}} , {{"}}"}} end {{"}}"}} \\"{{"}}"}}\$v.metadata.name{{"}}"}}\\": \\"{{"}}"}}\$v.status.podIP{{"}}"}}\\" {{"}}"}}end{{"}}"}} }"'
+    kubectl_command = 'kubectl get pods --namespace=${NAMESPACE} -l application=ceph,component=mon -o template --template="{ {{"{{"}}range  \$i, \$v  := .items{{"}}"}} {{"{{"}} if \$i{{"}}"}} , {{"{{"}} end {{"}}"}} \\"{{"{{"}}\$v.metadata.name{{"}}"}}\\": \\"{{"{{"}}\$v.status.podIP{{"}}"}}\\" {{"{{"}}end{{"}}"}} }"'
 
 monmap_command = "ceph --cluster=${CLUSTER} mon getmap > /tmp/monmap && monmaptool -f /tmp/monmap --print"
 

diff --git a/ceph/ceph/templates/bin/_remove-mon.sh.tpl b/ceph/ceph/templates/bin/_remove-mon.sh.tpl
diff --git a/ceph/ceph/templates/bin/_watch_mon_health.sh.tpl b/ceph/ceph/templates/bin/_watch_mon_health.sh.tpl
@@ -10,7 +10,7 @@ function watch_mon_health {
   while [ true ]
   do
     log "checking for zombie mons"
-    /check_zombie_mons.py || true
+    CLUSTER=$CLUSTER /check_zombie_mons.py || true
     log "sleep 30 sec"
     sleep 30
   done

diff --git a/ceph/ceph/templates/daemonset-mon.yaml b/ceph/ceph/templates/daemonset-mon.yaml
@@ -113,11 +113,6 @@ spec:
                   fieldPath: status.podIP
           command:
             - /start_mon.sh
-          lifecycle:
-            preStop:
-                exec:
-                  command:
-                    - /remove-mon.sh
           ports:
             - containerPort: 6789
           livenessProbe: