RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-21 10:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5484 from cxwshawn/de-fix

Browse Source 
ceph-dencoder: add RGWRegion, RGWZoneParams, RGWOLHInfo support.

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-08-06 09:25:17 -04:00
commit 0ab7926c00
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/rgw/rgw_dencoder.cc
View File

@ -419,6 +419,34 @@ void RGWBucketInfo::generate_test_instances(list<RGWBucketInfo*>& o)
o.push_back(new RGWBucketInfo);
}
void RGWRegion::generate_test_instances(list<RGWRegion*>& o)
{
RGWRegion *r = new RGWRegion;
o.push_back(r);
o.push_back(new RGWRegion);
}
void RGWZone::generate_test_instances(list<RGWZone*> &o)
{
RGWZone *z = new RGWZone;
o.push_back(z);
o.push_back(new RGWZone);
}
void RGWZoneParams::generate_test_instances(list<RGWZoneParams*> &o)
{
o.push_back(new RGWZoneParams);
o.push_back(new RGWZoneParams);
}
void RGWOLHInfo::generate_test_instances(list<RGWOLHInfo*> &o)
{
RGWOLHInfo *olh = new RGWOLHInfo;
olh->removed = false;
o.push_back(olh);
o.push_back(new RGWOLHInfo);
}
void RGWBucketEnt::generate_test_instances(list<RGWBucketEnt*>& o)
{
RGWBucketEnt *e = new RGWBucketEnt;

1
src/rgw/rgw_rados.cc
View File

@ -520,7 +520,6 @@ int RGWRegionMap::update(RGWRegion& region)
return 0;
}
void RGWObjVersionTracker::prepare_op_for_read(ObjectReadOperation *op)
{
obj_version *check_objv = version_for_check();

6
src/rgw/rgw_rados.h
View File

@ -76,7 +76,7 @@ struct RGWOLHInfo {
::decode(removed, bl);
DECODE_FINISH(bl);
}
static void generate_test_instances(list<RGWOLHInfo*>& o);
void dump(Formatter *f) const;
};
WRITE_CLASS_ENCODER(RGWOLHInfo)
@ -788,6 +788,7 @@ struct RGWZoneParams {
}
void dump(Formatter *f) const;
void decode_json(JSONObj *obj);
static void generate_test_instances(list<RGWZoneParams*>& o);
};
WRITE_CLASS_ENCODER(RGWZoneParams)
@ -833,6 +834,7 @@ struct RGWZone {
}
void dump(Formatter *f) const;
void decode_json(JSONObj *obj);
static void generate_test_instances(list<RGWZone*>& o);
};
WRITE_CLASS_ENCODER(RGWZone)
@ -852,6 +854,7 @@ struct RGWDefaultRegionInfo {
}
void dump(Formatter *f) const;
void decode_json(JSONObj *obj);
//todo: implement ceph-dencoder
};
WRITE_CLASS_ENCODER(RGWDefaultRegionInfo)
@ -954,6 +957,7 @@ struct RGWRegion {
void dump(Formatter *f) const;
void decode_json(JSONObj *obj);
static void generate_test_instances(list<RGWRegion*>& o);
};
WRITE_CLASS_ENCODER(RGWRegion)

6
src/test/encoding/types.h
View File

@ -235,7 +235,11 @@ TYPE(librbd::WatchNotify::ResponseMessage)
#include "rgw/rgw_rados.h"
TYPE(RGWObjManifestPart)
TYPE(RGWObjManifest)
TYPE(RGWOLHInfo)
TYPE(RGWRegion)
TYPE(RGWZone)
TYPE(RGWZoneParams)
#include "rgw/rgw_acl.h"
TYPE(ACLPermission)
TYPE(ACLGranteeType)