From 49f1cf1556f945f9eecfe8a23860a13a34f5f139 Mon Sep 17 00:00:00 2001
From: Wei Zhou <wei.zhou@windriver.com>
Date: Wed, 12 Sep 2018 11:54:47 -0400
Subject: [PATCH] Enable upstream Cinder volume backup/restore capabilities

Modify StarlingX system B&R procedure to align with upstream Cinder volume
backup/restore capabilities.

Tune settings to allow multiple cinder backups/restores to run in parallel.
The upstream cinder backup/restore algorithm is RAM dependent. The default
backup chunk size was about 2GB meaning running even a few backups in parallel
would quickly run out of RAM. The new backup chunk size is set below 500MB.

Story: 2003115
Task: 26393

Depends-On: Ic28661e52a3c6742840e4575741b95c2058eadb9
Change-Id: Ie71a2c90d89c3023fb8d043e1a26d80c43779133
Signed-off-by: Wei Zhou <wei.zhou@windriver.com>
---
 .../controllerconfig/backup_restore.py        | 60 -------------------
 .../src/hieradata/controller.yaml             |  6 ++
 2 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/controllerconfig/controllerconfig/controllerconfig/backup_restore.py b/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
index ba9656a980..af99091c7e 100644
--- a/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
+++ b/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
@@ -944,57 +944,6 @@ def backup_postgres(archive, staging_dir, cinder_config=False):
         raise BackupFail("Failed to backup database configuration")
 
 
-def set_cinder_volumes_snapshots_status():
-    """Update cinder volumes and cinder snapshots status to error,
-       except for those from external backends.
-    """
-
-    # All volumes from external backends should not be put into error.
-    # Only volumes from LVM and internal CEPH backend (all tiers) should be
-    # put into error.
-
-    # Possible cinder volumes hosts.
-    volumes_host = ["%@{}#%".format(sysinv_constants.SB_TYPE_CEPH),
-                    "%@{}#%".format(sysinv_constants.SB_TYPE_LVM)]
-
-    # Get the cinder volumes host for any secondary storage tiers.
-    storage_tiers_string = "SELECT NAME FROM STORAGE_TIERS WHERE " \
-                           "type='ceph' and NAME!='storage'"
-    storage_tiers_cmd = ["sudo", "-u", "postgres", "psql", "-t", "sysinv",
-                         "-c", storage_tiers_string]
-    storage_tiers = subprocess.check_output(storage_tiers_cmd)
-    storage_tiers = storage_tiers.split()
-    if storage_tiers:
-        for tier in storage_tiers:
-            cinder_volumes_host = "%@{}-{}#%".format(
-                sysinv_constants.SB_TYPE_CEPH, tier)
-            volumes_host.append(cinder_volumes_host)
-
-    # Get the volumes backed by LVM or internal CEPH.
-    get_volumes_cmd_string = "SELECT ID FROM VOLUMES WHERE HOST LIKE ANY "\
-                             " (ARRAY%s)" % volumes_host
-    get_volumes_cmd = ["sudo", "-u", "postgres", "psql", "-t", "cinder", "-c",
-                       get_volumes_cmd_string]
-    volumes = subprocess.check_output(get_volumes_cmd)
-    volumes = volumes.split()
-
-    # Set the status to error for all the cinder volumes and snapshots backed
-    # by LVM or internal CEPH.
-    if volumes:
-        volumes = str(volumes).replace('[', '(').replace(']', ')')
-        cmd_string = "UPDATE VOLUMES SET STATUS='error' WHERE ID " \
-                     "IN %s" % volumes
-        cmd = ["sudo", "-u", "postgres", "psql", "-d", "cinder", "-c",
-               cmd_string]
-        subprocess.check_call(cmd, stdout=DEVNULL, stderr=DEVNULL)
-
-        cmd_string = "UPDATE SNAPSHOTS SET STATUS='error' WHERE VOLUME_ID " \
-                     "IN %s" % volumes
-        cmd = ["sudo", "-u", "postgres", "psql", "-d", "cinder", "-c",
-               cmd_string]
-        subprocess.check_call(cmd, stdout=DEVNULL, stderr=DEVNULL)
-
-
 def restore_postgres(archive, staging_dir):
     """ Restore postgres configuration """
     try:
@@ -1017,15 +966,6 @@ def restore_postgres(archive, staging_dir):
                                    data, db_elem],
                                   stdout=DEVNULL)
 
-        if tsconfig.region_config != 'yes':
-            # TODO (rchurch): Should this call the sysinv API to see if the
-            # backend is configured?
-            if subprocess.check_output(["sudo",
-                                        "-u", "postgres",
-                                        "psql", "-lqt"]).find('cinder') != -1:
-                # The backing store for cinder volumes and snapshots is not
-                # restored, so their status must be set to error.
-                set_cinder_volumes_snapshots_status()
     except (OSError, subprocess.CalledProcessError, tarfile.TarError) as e:
         LOG.error("Failed to restore postgres databases. Error: %s", e)
         raise RestoreFail("Failed to restore database configuration")
diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml
index 7991381ccb..01c79db493 100644
--- a/puppet-manifests/src/hieradata/controller.yaml
+++ b/puppet-manifests/src/hieradata/controller.yaml
@@ -372,6 +372,12 @@ cinder::volume::enabled: false
 
 cinder::backup::posix::backup_posix_path: '/opt/backups'
 
+# backup_file_size should be below 500MB to allow multiple backups
+# to run in parallel and not consume all RAM.
+# backup_file_size must be a multiple of backup_sha_block_size_bytes
+# which has a default value of 32768 bytes.
+cinder::backup::posix::backup_file_size: 499974144
+
 cinder::policy::policies:
   enable_consistencygroup_create:
     key: 'consistencygroup:create'