RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSD fails to start with error assert(values.size() == 2)

Browse Source 
Remove redundant setting of dirty_info
Fix PG::upgrade() to conform to programming style
Set dirty_big_info in PG::write_info for upgrades

BUG: #4562

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
This commit is contained in:
David Zafman 2013-03-27 11:06:07 -07:00
parent c8317dde73
commit b0103abdee
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/PG.cc
View File

@ -1795,7 +1795,6 @@ void PG::_activate_committed(epoch_t e)
if (dirty_info) {
ObjectStore::Transaction *t = new ObjectStore::Transaction;
dirty_info = true;
write_if_dirty(*t);
int tr = osd->store->queue_transaction(osr.get(), t);
assert(tr == 0);
@ -2352,9 +2351,8 @@ void PG::init(int role, vector<int>& newup, vector<int>& newacting, pg_history_t
write_if_dirty(*t);
}
void PG::upgrade(
ObjectStore *store,
const interval_set<snapid_t> &snapcolls) {
void PG::upgrade(ObjectStore *store, const interval_set<snapid_t> &snapcolls)
{
unsigned removed = 0;
for (interval_set<snapid_t>::const_iterator i = snapcolls.begin();
i != snapcolls.end();
@ -2504,6 +2502,7 @@ void PG::write_info(ObjectStore::Transaction& t)
info_struct_v = cur_struct_v;
::encode(info_struct_v, attrbl);
t.collection_setattr(coll, "info", attrbl);
dirty_big_info = true;
}
// info. store purged_snaps separately.