From: Xing Lin <xinglin@cs.utah.edu>
Date: Thu, 28 Nov 2013 05:06:37 +0000 (-0700)
Subject: test/filestore/workloadgen: added check of return value for mkdir
X-Git-Tag: v0.74~36^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2884c817660f3c846187d3fb3e77ac8fea11d22c;p=ceph.git

test/filestore/workloadgen: added check of return value for mkdir

check return value of mkdir

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>

test/filestore/workloadgen: fix return value check for mkdir

allow EEXIST from mkdir()

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
---

diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc
index 704d93021e2c..aadb4758d96d 100644
--- a/src/test/filestore/workload_generator.cc
+++ b/src/test/filestore/workload_generator.cc
@@ -65,7 +65,8 @@ WorkloadGenerator::WorkloadGenerator(vector<const char*> args)
   dout(0) << "journal         = " << g_conf->osd_journal << dendl;
   dout(0) << "journal size    = " << g_conf->osd_journal_size << dendl;
 
-  ::mkdir(g_conf->osd_data.c_str(), 0755);
+  err = ::mkdir(g_conf->osd_data.c_str(), 0755);
+  ceph_assert(err == 0 || (err < 0 && errno == EEXIST));
   ObjectStore *store_ptr = new FileStore(g_conf->osd_data, g_conf->osd_journal);
   m_store.reset(store_ptr);
   err = m_store->mkfs();