]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: no fatal assert on ino allocation failures
authorSage Weil <sage@newdream.net>
Tue, 23 Jun 2009 03:29:40 +0000 (20:29 -0700)
committerSage Weil <sage@newdream.net>
Tue, 23 Jun 2009 16:33:12 +0000 (09:33 -0700)
We still log them LOG_ERR.  Client will be unhappy, but
that's their problem.

src/mds/Server.cc

index 356d00421324e8a1e61e368efae2f2eb1371a860..72f131ff692aa36f188c5a1c78366e47e21e0231 100644 (file)
@@ -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();