cephadm: bail out early during adopt if data dir not present

In case someone tries to run this again on an already adopted daemon...

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit bed711d3d1256758bdf7428339316bcca6f9dae0)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c16a0c9258021a506842f251f105045787b6c43b..475a96e42816de8f3c4e601ef974d581ee4b27e5 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3181,6 +3181,11 @@ def command_adopt_ceph(daemon_type, daemon_id, fsid):
                     (daemon_type, args.cluster, daemon_id))
     data_dir_src = os.path.abspath(args.legacy_dir + data_dir_src)
 
+    if not os.path.exists(data_dir_src):
+        raise Error("{}.{} data directory '{}' does not exist.  "
+                    "Incorrect ID specified, or daemon alrady adopted?".format(
+                    daemon_type, daemon_id, data_dir_src))
+
     osd_fsid = None
     if daemon_type == 'osd':
         adopt_osd = AdoptOsd(data_dir_src, daemon_id)