From: Samuel Just <sam.just@inktank.com>
Date: Fri, 22 Jun 2012 00:08:20 +0000 (-0700)
Subject: osd_types.cc: remove hobject_t decode asserts
X-Git-Tag: v0.48argonaut~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fcc3dee9aca93f6069427f007befb8c06519aa7;p=ceph.git

osd_types.cc: remove hobject_t decode asserts

These asserts were useful for ensuring that pool is passed
in in the correct places, but they prevent the encoder
testing from working.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index cdc7d67a31c..458f05dd427 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1549,7 +1549,6 @@ void pg_log_t::decode(bufferlist::iterator &bl, int64_t pool)
 
   // handle hobject_t format change
   if (struct_v < 4) {
-    assert(pool != -1);
     for (list<pg_log_entry_t>::iterator i = log.begin();
 	 i != log.end();
 	 ++i) {
@@ -1665,7 +1664,6 @@ void pg_missing_t::decode(bufferlist::iterator &bl, int64_t pool)
   DECODE_FINISH(bl);
 
   if (struct_v < 3) {
-    assert(pool != -1);
     // Handle hobject_t upgrade
     map<hobject_t, item> tmp;
     for (map<hobject_t, item>::iterator i = missing.begin();
@@ -2341,7 +2339,6 @@ void ObjectRecoveryInfo::decode(bufferlist::iterator &bl,
   DECODE_FINISH(bl);
 
   if (struct_v < 2) {
-    assert(pool != -1);
     if (soid.pool == -1)
       soid.pool = pool;
     map<hobject_t, interval_set<uint64_t> > tmp;
@@ -2446,7 +2443,6 @@ void ScrubMap::decode(bufferlist::iterator& bl, int64_t pool)
 
   // handle hobject_t upgrade
   if (struct_v < 3) {
-    assert(pool != -1);
     map<hobject_t, object> tmp;
     tmp.swap(objects);
     for (map<hobject_t, object>::iterator i = tmp.begin();