From: Sage Weil <sage@newdream.net>
Date: Tue, 23 Jun 2009 03:29:40 +0000 (-0700)
Subject: mds: no fatal assert on ino allocation failures
X-Git-Tag: v0.10~174
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6cb25111f37f20a472002a1d8d97e113f09cf7f;p=ceph.git

mds: no fatal assert on ino allocation failures

We still log them LOG_ERR.  Client will be unhappy, but
that's their problem.
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 356d00421324..72f131ff692a 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1433,10 +1433,10 @@ CInode* Server::prepare_new_inode(MDRequest *mdr, CDir *dir, inodeno_t useino)
   if (useino && useino != in->inode.ino) {
     dout(0) << "WARNING: client specified " << useino << " and i allocated " << in->inode.ino << dendl;
     stringstream ss;
-    ss << mdr->client_request->get_orig_source() << " specified ino " << useino << " but mds" << mds->whoami
-       << " allocated " << in->inode.ino;
+    ss << mdr->client_request->get_orig_source() << " specified ino " << useino
+       << " but mds" << mds->whoami << " allocated " << in->inode.ino;
     mds->logclient.log(LOG_ERROR, ss);
-    assert(0); // just for now.
+    //assert(0); // just for now.
   }
     
   int got = g_conf.mds_client_prealloc_inos - mdr->session->get_num_projected_prealloc_inos();