Merge pull request ceph#57319 from TRYTOBE8TME/wip-bug-59488

src/rgw: Fixing event name

Author: yuvalif

src/rgw/rgw_lc.cc

@@ -1247,7 +1247,7 @@ class LCOpAction_NonCurrentExpiration : public LCOpAction {
   int process(lc_op_ctx& oc) override {
     auto& o = oc.o;
     int r = remove_expired_obj(oc.dpp, oc, true,
-                               {rgw::notify::ObjectExpirationNoncurrent});
+                               {rgw::notify::ObjectExpirationNonCurrent});
     if (r < 0) {
       ldpp_dout(oc.dpp, 0) << "ERROR: remove_expired_obj (non-current expiration) " 
 			   << oc.bucket << ":" << o.key
@@ -1390,7 +1390,7 @@ class LCOpAction_Transition : public LCOpAction {
                               << "flags: " << oc.o.flags << dendl;
       } else {
         ret = remove_expired_obj(oc.dpp, oc, true,
-                                 {rgw::notify::ObjectTransitionNoncurrent});
+                                 {rgw::notify::ObjectTransitionNonCurrent});
         ldpp_dout(oc.dpp, 20)
             << "delete_tier_obj Object(key:" << oc.o.key << ") not current "
             << "versioned_epoch:  " << oc.o.versioned_epoch
@@ -1427,7 +1427,7 @@ class LCOpAction_Transition : public LCOpAction {
                          {rgw::notify::ObjectTransitionCurrent,
                           rgw::notify::LifecycleTransition});
     } else {
-      event_types.push_back(rgw::notify::ObjectTransitionNoncurrent);
+      event_types.push_back(rgw::notify::ObjectTransitionNonCurrent);
     }
 
     std::unique_ptr<rgw::sal::Notification> notify =

src/rgw/rgw_notify_event_type.cc

@@ -31,7 +31,7 @@ namespace rgw::notify {
     case ObjectExpirationCurrent:
       return "s3:ObjectLifecycle:Expiration:Current";
     case ObjectExpirationNoncurrent:
-      return "s3:ObjectLifecycle:Expiration:Noncurrent";
+      return "s3:ObjectLifecycle:Expiration:NonCurrent";
     case ObjectExpirationDeleteMarker:
       return "s3:ObjectLifecycle:Expiration:DeleteMarker";
     case ObjectExpirationAbortMPU:
@@ -41,7 +41,7 @@ namespace rgw::notify {
     case ObjectTransitionCurrent:
       return "s3:ObjectLifecycle:Transition:Current";
     case ObjectTransitionNoncurrent:
-      return "s3:ObjectLifecycle:Transition:Noncurrent";
+      return "s3:ObjectLifecycle:Transition:NonCurrent";
     case ObjectSynced:
       return "s3:ObjectSynced:*";
     case ObjectSyncedCreate:
@@ -99,8 +99,10 @@ namespace rgw::notify {
         return ObjectExpiration;
     if (s == "s3:ObjectLifecycle:Expiration:Current")
         return ObjectExpirationCurrent;
+    if (s == "s3:ObjectLifecycle:Expiration:NonCurrent")
+        return ObjectExpirationNonCurrent;
     if (s == "s3:ObjectLifecycle:Expiration:Noncurrent")
-        return ObjectExpirationNoncurrent;
+        return ObjectExpirationNonCurrent;
     if (s == "s3:ObjectLifecycle:Expiration:DeleteMarker")
         return ObjectExpirationDeleteMarker;
     if (s == "s3:ObjectLifecycle:Expiration:AbortMultipartUpload")
@@ -109,8 +111,10 @@ namespace rgw::notify {
         return ObjectTransition;
     if (s == "s3:ObjectLifecycle:Transition:Current")
         return ObjectTransitionCurrent;
+    if (s == "s3:ObjectLifecycle:Transition:NonCurrent")
+        return ObjectTransitionNonCurrent;
     if (s == "s3:ObjectLifecycle:Transition:Noncurrent")
-        return ObjectTransitionNoncurrent;
+        return ObjectTransitionNonCurrent;
     if (s == "s3:ObjectSynced:*")
         return ObjectSynced;
     if (s == "s3:ObjectSynced:Create")

src/rgw/rgw_notify_event_type.h

@@ -20,11 +20,13 @@ namespace rgw::notify {
     ObjectExpiration                     = 0xF00,
     ObjectExpirationCurrent              = 0x100,
     ObjectExpirationNoncurrent           = 0x200,
+    ObjectExpirationNonCurrent           = 0x200,
     ObjectExpirationDeleteMarker         = 0x400,
     ObjectExpirationAbortMPU             = 0x800,
     ObjectTransition                     = 0xF000,
     ObjectTransitionCurrent              = 0x1000,
     ObjectTransitionNoncurrent           = 0x2000,
+    ObjectTransitionNonCurrent           = 0x2000,
     ObjectSynced                         = 0xF0000,
     ObjectSyncedCreate                   = 0x10000,
     ObjectSyncedDelete                   = 0x20000,