Merge pull request ceph#62761 from rhcs-dashboard/tiering-fix

mgr/dashboard: RGW - Reatin Head Object Fix

Reviewed-by: Afreen Misbah <[email protected]>
Reviewed-by: Aashish Sharma <[email protected]>

Author: afreen23

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-storage-class.model.ts

@@ -19,6 +19,7 @@ export interface StorageClassDetails {
   multipart_min_part_size: number;
   multipart_sync_threshold: number;
   host_style: string;
+  retain_head_object: boolean;
 }
 
 export interface S3Details {
@@ -38,6 +39,7 @@ export interface TierTarget {
   val: {
     storage_class: string;
     tier_type: string;
+    retain_head_object: boolean;
     s3: S3Details;
   };
 }
@@ -55,6 +57,7 @@ export interface StorageClassDetails {
   multipart_sync_threshold: number;
   host_style: string;
 }
+
 export interface ZoneGroup {
   name: string;
   id: string;
@@ -74,7 +77,6 @@ export interface S3Details {
   host_style: boolean;
   retain_head_object?: boolean;
 }
-
 export interface RequestModel {
   zone_group: string;
   placement_targets: PlacementTarget[];

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-details/rgw-storage-class-details.component.html

@@ -107,6 +107,18 @@
             </td>
             <td>{{ selection?.multipart_sync_threshold }}</td>
           </tr>
+          <tr>
+            <td
+                class="bold">
+              Retain Head Object
+              <cd-helper class="text-pre-wrap">
+                <span i18n>
+                  Retain object metadata after transition to the cloud (default: false).
+                </span>
+              </cd-helper>
+            </td>
+            <td>{{ selection?.retain_head_object }}</td>
+          </tr>
         </tbody>
       </table>
     </cds-tab>

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-details/rgw-storage-class-details.component.spec.ts

@@ -38,7 +38,8 @@ describe('RgwStorageClassDetailsComponent', () => {
       target_path: '/test/path',
       multipart_min_part_size: 100,
       multipart_sync_threshold: 200,
-      host_style: 'path'
+      host_style: 'path',
+      retain_head_object: true
     };
     component.selection = mockSelection;
     component.ngOnChanges();

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-details/rgw-storage-class-details.component.ts

@@ -21,7 +21,8 @@ export class RgwStorageClassDetailsComponent implements OnChanges {
         target_path: this.selection.target_path,
         multipart_min_part_size: this.selection.multipart_min_part_size,
         multipart_sync_threshold: this.selection.multipart_sync_threshold,
-        host_style: this.selection.host_style
+        host_style: this.selection.host_style,
+        retain_head_object: this.selection.retain_head_object
       };
     }
   }

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.spec.ts

@@ -71,6 +71,7 @@ describe('RgwStorageClassFormComponent', () => {
                   val: {
                     storage_class: 'CLOUDIBM',
                     tier_type: 'cloud-s3',
+                    retain_head_object: true,
                     s3: {
                       endpoint: 'https://s3.amazonaws.com',
                       access_key: 'ACCESSKEY',
@@ -94,6 +95,7 @@ describe('RgwStorageClassFormComponent', () => {
                   val: {
                     storage_class: 'CloudIBM',
                     tier_type: 'cloud-s3',
+                    retain_head_object: true,
                     s3: {
                       endpoint: 'https://s3.amazonaws.com',
                       access_key: 'ACCESSKEY',

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.ts

@@ -80,7 +80,7 @@ export class RgwStorageClassFormComponent extends CdForm implements OnInit {
     this.targetSecretKeyText =
       "To view or copy your secret key, go to your cloud service's user management or credentials section, find your user profile, and locate the access key. You can view and copy the key by following the instructions provided.";
     this.retainHeadObjectText =
-      'Retain object metadata after transition to the cloud (default: deleted).';
+      'Retain object metadata after transition to the cloud (default: false).';
     this.createForm();
     this.loadingReady();
     this.loadZoneGroup();
@@ -111,7 +111,7 @@ export class RgwStorageClassFormComponent extends CdForm implements OnInit {
           this.storageClassForm.get('target_path').setValue(response.target_path);
           this.storageClassForm
             .get('retain_head_object')
-            .setValue(response.retain_head_object || false);
+            .setValue(this.tierTargetInfo?.val?.retain_head_object || false);
           this.storageClassForm
             .get('multipart_sync_threshold')
             .setValue(response.multipart_sync_threshold || '');

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/utils/rgw-bucket-tiering.ts

@@ -27,6 +27,7 @@ export class BucketTieringUtils {
       zonegroup_name: zoneGroup,
       placement_target: targetName,
       storage_class: tierTarget.val.storage_class,
+      retain_head_object: tierTarget.val.retain_head_object,
       ...tierTarget.val.s3
     };
   }

src/pybind/mgr/dashboard/services/rgw_client.py

@@ -1864,6 +1864,14 @@ def ensure_realm_and_sync_period(self):
         else:
             self.update_period()
 
+    def modify_retain_head(self, tier_config: dict) -> List[str]:
+        tier_config_items = []
+        for key, value in tier_config.items():
+            if isinstance(value, bool):
+                value = str(value).lower()
+            tier_config_items.append(f'{key}={value}')
+        return tier_config_items
+
     def add_placement_targets(self, zonegroup_name: str, placement_targets: List[Dict]):
         rgw_add_placement_cmd = ['zonegroup', 'placement', 'add']
         STANDARD_STORAGE_CLASS = "STANDARD"
@@ -1882,9 +1890,7 @@ def add_placement_targets(self, zonegroup_name: str, placement_targets: List[Dic
             ):
                 tier_config = placement_target.get('tier_config', {})
                 if tier_config:
-                    tier_config_items = (
-                        f'{key}={value}' for key, value in tier_config.items()
-                    )
+                    tier_config_items = self.modify_retain_head(tier_config)
                     tier_config_str = ','.join(tier_config_items)
                     cmd_add_placement_options += [
                         '--tier-type', 'cloud-s3', '--tier-config', tier_config_str
@@ -1957,9 +1963,7 @@ def modify_placement_targets(self, zonegroup_name: str, placement_targets: List[
             ):
                 tier_config = placement_target.get('tier_config', {})
                 if tier_config:
-                    tier_config_items = (
-                        f'{key}={value}' for key, value in tier_config.items()
-                    )
+                    tier_config_items = self.modify_retain_head(tier_config)
                     tier_config_str = ','.join(tier_config_items)
                     cmd_add_placement_options += [
                         '--tier-type', 'cloud-s3', '--tier-config', tier_config_str