rgw/bucket-logging: minor code cleanup

Fixes a typo in a variable name and the placement
of a comment.

Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>

diff --git a/src/rgw/driver/rados/rgw_notify.cc b/src/rgw/driver/rados/rgw_notify.cc
index c7876ec62413d683258fc15ffc3e2beb6e392607..2f000f503cf6bad75b00a39685801644f947808c 100644 (file)
--- a/src/rgw/driver/rados/rgw_notify.cc
+++ b/src/rgw/driver/rados/rgw_notify.cc
@@ -50,7 +50,7 @@ static inline std::ostream& operator<<(std::ostream& out,
 
 struct persistency_tracker {
   ceph::coarse_real_time last_retry_time {ceph::coarse_real_clock::zero()};
-  uint32_t retires_num {0};
+  uint32_t retries_num {0};
 };
 
 using queues_t = std::set<std::string>;
@@ -233,11 +233,11 @@ private:
     const auto time_now = ceph::coarse_real_clock::now();
     if ( (topic_persistency_ttl != 0 && event_entry.creation_time != ceph::coarse_real_clock::zero() &&
          time_now - event_entry.creation_time > std::chrono::seconds(topic_persistency_ttl))
-         || ( topic_persistency_max_retries != 0 && entry_persistency_tracker.retires_num >  topic_persistency_max_retries) ) {
+         || ( topic_persistency_max_retries != 0 && entry_persistency_tracker.retries_num >  topic_persistency_max_retries) ) {
       ldpp_dout(this, 1) << "WARNING: Expiring entry marker: " << entry.marker
                          << " for event with " << event_entry
                          << " entry retry_number: "
-                         << entry_persistency_tracker.retires_num
+                         << entry_persistency_tracker.retries_num
                          << " creation_time: " << event_entry.creation_time
                          << " time_now: " << time_now << dendl;
       return EntryProcessingResult::Expired;
@@ -246,11 +246,11 @@ private:
       return EntryProcessingResult::Sleeping;
     }
 
-    ++entry_persistency_tracker.retires_num;
+    ++entry_persistency_tracker.retries_num;
     entry_persistency_tracker.last_retry_time = time_now;
     ldpp_dout(this, 20) << "Processing event entry with " << event_entry
                         << " retry_number: "
-                        << entry_persistency_tracker.retires_num
+                        << entry_persistency_tracker.retries_num
                         << " current time: " << time_now << dendl;
     ret = push_endpoint->send(this, event_entry.event, yield);
     if (ret < 0) {

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 9bacbcb23c5d4e9037aa28b3e2047295b0563c20..cb3428ea9da240a83037419f79305bdb28388e79 100644 (file)
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -255,7 +255,8 @@ int rgw::AppMain::init_storage()
           run_quota,
           run_sync,
           g_conf().get_val<bool>("rgw_dynamic_resharding"),
-               true, true, null_yield, env.cfgstore, // run notification thread
+         true, // run notification thread
+         true, null_yield, env.cfgstore,
           g_conf()->rgw_cache_enabled);
   if (!env.driver) {
     return -EIO;