[cloudstack] branch master updated: Update schema-41310to41400.sql (#3999)

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andrijapanic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new d52f3f4  Update schema-41310to41400.sql (#3999)
d52f3f4 is described below

commit d52f3f4a6b33618a6f6c50d97dc1a9545880886c
Author: Andrija Panic <45...@users.noreply.github.com>
AuthorDate: Sat Apr 4 14:07:14 2020 +0200

    Update schema-41310to41400.sql (#3999)
    
    * Update schema-41310to41400.sql
    
    * update desc
    
    * update the config key as well
    
    * Update schema-41310to41400.sql (#4012)
    
    * Update schema-41310to41400.sql
    
    * update configkey desc
---
 engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql | 4 ++++
 server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
index bc00941..baa7bcf 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
@@ -19,6 +19,10 @@
 -- Schema upgrade from 4.13.1.0 to 4.14.0.0
 --;
 
+-- Update the description to indicate this only works with KVM + Ceph 
+-- (not implemented properly atm for KVM+NFS/local, and it accidentaly works with XS + NFS. Not applicable for VMware)
+UPDATE `cloud`.`configuration` SET `description`='Indicates whether to always backup primary storage snapshot to secondary storage. Keeping snapshots only on Primary storage is applicable for KVM + Ceph only.' WHERE  `name`='snapshot.backup.to.secondary';
+
 -- KVM: enable storage data motion on KVM hypervisor_capabilities
 UPDATE `cloud`.`hypervisor_capabilities` SET `storage_motion_supported` = 1 WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';
 
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
index 407ffa3..c900b2d 100644
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
@@ -57,7 +57,7 @@ public interface SnapshotManager extends Configurable {
             "Time in seconds between retries in backing up snapshot to secondary", false, ConfigKey.Scope.Global, null);
 
     public static final ConfigKey<Boolean> BackupSnapshotAfterTakingSnapshot = new ConfigKey<Boolean>(Boolean.class, "snapshot.backup.to.secondary",  "Snapshots", "true",
-            "Indicates whether to always backup primary storage snapshot to secondary storage", false, ConfigKey.Scope.Global, null);
+            "Indicates whether to always backup primary storage snapshot to secondary storage. Keeping snapshots only on Primary storage is applicable for KVM + Ceph only.", false, ConfigKey.Scope.Global, null);
 
     void deletePoliciesForVolume(Long volumeId);