From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Jan 2016 18:03:59 +0000 (-0500)
Subject: ceph-objectstore-tool: 'whoami' is not required for an ObjectStore
X-Git-Tag: v10.0.4~154^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=614f1653ee8053507825997d6e12af0fc8353e7d;p=ceph.git

ceph-objectstore-tool: 'whoami' is not required for an ObjectStore

OSD creates it, but it won't be there if we did --op mkfs

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index b6a3fd8b59aa..dd8a7470da35 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2450,14 +2450,6 @@ int main(int argc, char **argv)
     if (!S_ISDIR(st.st_mode)) {
       invalid_filestore_path(dpath);
     }
-    string check = dpath + "/whoami";
-    if (::stat(check.c_str(), &st) == -1) {
-       perror("whoami");
-       invalid_filestore_path(dpath);
-    }
-    if (!S_ISREG(st.st_mode)) {
-      invalid_filestore_path(dpath);
-    }
     check = dpath + "/current";
     if (::stat(check.c_str(), &st) == -1) {
        perror("current");