From: Sebastian Wagner <sewagner@redhat.com>
Date: Wed, 14 Jul 2021 13:15:50 +0000 (+0200)
Subject: cephadm: exec: also search for old cname
X-Git-Tag: v16.2.6~54^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d52167b3fa1ed6bde063d328fefe2af4a2516092;p=ceph.git

cephadm: exec: also search for old cname

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit a57ab6f50968921b26b87695e704f84a25101597)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 627ff05ea59d..468ae6ec660d 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2081,14 +2081,18 @@ def check_units(ctx, units, enabler=None):
 
 
 def is_container_running(ctx: CephadmContext, c: 'CephContainer') -> bool:
+    return bool(get_running_container_name(ctx, c))
+
+
+def get_running_container_name(ctx: CephadmContext, c: 'CephContainer') -> Optional[str]:
     for name in [c.cname, c.old_cname]:
         out, err, ret = call(ctx, [
             ctx.container_engine.path, 'container', 'inspect',
             '--format', '{{.State.Status}}', name
         ])
         if out == 'running':
-            return True
-    return False
+            return name
+    return None
 
 
 def get_legacy_config_fsid(cluster, legacy_dir=None):
@@ -3361,6 +3365,9 @@ class CephContainer:
 
     def exec_cmd(self, cmd):
         # type: (List[str]) -> List[str]
+        cname = get_running_container_name(self.ctx, self)
+        if not cname:
+            raise Error('unable to find container "{}"'.format(self.cname))
         return [
             str(self.ctx.container_engine.path),
             'exec',