diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-25 11:31:08 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-25 11:31:08 -0700 |
| commit | 096af5ed09a6d6f10470864c710edfe349a83735 (patch) | |
| tree | a363addc21f873e1789cd0b184287dbdd3e35ec6 | |
| parent | f653aa570e5ebfd5ca955fafb7f500148a144bd7 (diff) | |
| parent | a0559880bd1eb2b44a9a69a50fabef241da1faaa (diff) | |
| download | ceph-096af5ed09a6d6f10470864c710edfe349a83735.tar.gz | |
Merge pull request #465 from dalgaaf/wip-da-CID-2
Fix some more CID issues
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/mon/Monitor.cc | 1 | ||||
| -rw-r--r-- | src/os/ObjectStore.cc | 1 | ||||
| -rw-r--r-- | src/rgw/rgw_metadata.cc | 14 | ||||
| -rw-r--r-- | src/rgw/rgw_metadata.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 9492f7c9168..bd189f1430c 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -143,6 +143,7 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s, elector(this), leader(0), quorum_features(0), + scrub_version(0), // sync state sync_provider_count(0), diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc index ae97b6b08d3..9d8b989225b 100644 --- a/src/os/ObjectStore.cc +++ b/src/os/ObjectStore.cc @@ -435,6 +435,7 @@ void ObjectStore::Transaction::dump(ceph::Formatter *f) f->dump_string("first", first); f->dump_string("last", last); } + break; default: f->dump_string("op_name", "unknown"); diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc index ac8c703f5e0..e9094ad35d6 100644 --- a/src/rgw/rgw_metadata.cc +++ b/src/rgw/rgw_metadata.cc @@ -505,15 +505,15 @@ int RGWMetadataManager::pre_modify(RGWMetadataHandler *handler, string& section, /* if write version has not been set, and there's a read version, set it so that we can * log it */ - if (objv_tracker && objv_tracker->read_version.ver && - !objv_tracker->write_version.ver) { - objv_tracker->write_version = objv_tracker->read_version; - objv_tracker->write_version.ver++; + if (objv_tracker) { + if (objv_tracker->read_version.ver && !objv_tracker->write_version.ver) { + objv_tracker->write_version = objv_tracker->read_version; + objv_tracker->write_version.ver++; + } + log_data.read_version = objv_tracker->read_version; + log_data.write_version = objv_tracker->write_version; } - log_data.read_version = objv_tracker->read_version; - log_data.write_version = objv_tracker->write_version; - log_data.status = op_type; bufferlist logbl; diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h index 2cc9110191a..3ff3b3317b8 100644 --- a/src/rgw/rgw_metadata.h +++ b/src/rgw/rgw_metadata.h @@ -102,7 +102,7 @@ public: bool done; - LogListCtx() : done(false) {} + LogListCtx() : cur_shard(0), done(false) {} }; void init_list_entries(int shard_id, utime_t& from_time, utime_t& end_time, string& marker, void **handle); |