From: Sage Weil <sage@newdream.net>
Date: Thu, 5 Apr 2012 19:59:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-log'
X-Git-Tag: v0.46~124
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b76953520af7abf67a572048ee9a2350aa9b51e;p=ceph.git

Merge remote-tracking branch 'gh/wip-log'
---

1b76953520af7abf67a572048ee9a2350aa9b51e
diff --cc src/osd/OSDMap.cc
index b98dcfa68fd0,67cd4cb7c018..8167046b0b71
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@@ -1284,15 -1277,9 +1286,15 @@@ void OSDMap::build_simple_crush_map_fro
      map<string,string> loc;
      loc["host"] = host;
      loc["rack"] = rack;
 +    if (row.size())
 +      loc["row"] = row;
 +    if (room.size())
 +      loc["room"] = room;
 +    if (dc.size())
 +      loc["datacenter"] = dc;
      loc["pool"] = "default";
  
-     ldout(cct, 0) << " adding osd." << o << " at " << loc << dendl;
+     ldout(cct, 5) << " adding osd." << o << " at " << loc << dendl;
      crush.insert_item(cct, o, 1.0, *i, loc);
    }