diff options
| author | Doug Shelley <doug@parelastic.com> | 2014-09-07 14:19:07 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@tesora.com> | 2014-09-11 19:57:09 -0400 |
| commit | 648358509b6e4c101102d7a8b34ed02fb4a695b7 (patch) | |
| tree | 379b859e830a599c02e5647eac86ecaa0d900fed | |
| parent | 70417f0b1d411343ab552f32bc4b12ad9724e9d3 (diff) | |
| download | trove-648358509b6e4c101102d7a8b34ed02fb4a695b7.tar.gz | |
Fix NoSuchOptError on Couchbase create
A previous commit moved the backup_incremental_strategy option from
DEFAULT group to datastore specific grouping. However, the option was
only implemented for Mysql and Percona so when any datastore that had
backup support (like Couchbase) attempted to start, it received a
NoSuchOptError because of the missing option.
This fix put an empty dict in for the option for all datastores that
don't currently have backup or incremental backup support implemented.
Note: this wasn't picked up by any automated tests because the gate
currently only tests MySQL.
Author: Doug Shelley <doug@parelastic.com>
Co-Authored-By: Amrith Kumar <amrith@tesora.com>
Change-Id: I6a11dcf79c483a43ebdf79085d1bd17d653afe59
Closes-Bug: 1366175
| -rw-r--r-- | trove/common/cfg.py | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 3e6f23e7..b5c0bac3 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -404,6 +404,13 @@ redis_opts = [ 'if trove_security_groups_support is True).'), cfg.StrOpt('backup_strategy', default=None, help='Default strategy to perform backups.'), + cfg.DictOpt('backup_incremental_strategy', + default={}, + help='Incremental Backup Runner based on the default' + ' strategy. For strategies that do not implement an' + ' incremental, the runner will use the default full backup.', + deprecated_name='backup_incremental_strategy', + deprecated_group='DEFAULT'), cfg.StrOpt('replication_strategy', default=None, help='Default strategy for replication.'), cfg.StrOpt('mount_point', default='/var/lib/redis', @@ -430,6 +437,13 @@ cassandra_opts = [ 'if trove_security_groups_support is True).'), cfg.StrOpt('backup_strategy', default=None, help='Default strategy to perform backups.'), + cfg.DictOpt('backup_incremental_strategy', + default={}, + help='Incremental Backup Runner based on the default' + ' strategy. For strategies that do not implement an' + ' incremental, the runner will use the default full backup.', + deprecated_name='backup_incremental_strategy', + deprecated_group='DEFAULT'), cfg.StrOpt('replication_strategy', default=None, help='Default strategy for replication.'), cfg.StrOpt('mount_point', default='/var/lib/cassandra', @@ -458,6 +472,13 @@ couchbase_opts = [ 'if trove_security_groups_support is True).'), cfg.StrOpt('backup_strategy', default='CbBackup', help='Default strategy to perform backups.'), + cfg.DictOpt('backup_incremental_strategy', + default={}, + help='Incremental Backup Runner based on the default' + ' strategy. For strategies that do not implement an' + ' incremental, the runner will use the default full backup.', + deprecated_name='backup_incremental_strategy', + deprecated_group='DEFAULT'), cfg.StrOpt('replication_strategy', default=None, help='Default strategy for replication.'), cfg.StrOpt('mount_point', default='/var/lib/couchbase', @@ -493,6 +514,13 @@ mongodb_opts = [ 'if trove_security_groups_support is True).'), cfg.StrOpt('backup_strategy', default=None, help='Default strategy to perform backups.'), + cfg.DictOpt('backup_incremental_strategy', + default={}, + help='Incremental Backup Runner based on the default' + ' strategy. For strategies that do not implement an' + ' incremental, the runner will use the default full backup.', + deprecated_name='backup_incremental_strategy', + deprecated_group='DEFAULT'), cfg.StrOpt('replication_strategy', default=None, help='Default strategy for replication.'), cfg.StrOpt('mount_point', default='/var/lib/mongodb', @@ -540,6 +568,11 @@ postgresql_opts = [ 'if trove_security_groups_support is True).'), cfg.StrOpt('backup_strategy', default='PgDump', help='Default strategy to perform backups.'), + cfg.DictOpt('backup_incremental_strategy', + default={}, + help='Incremental Backup Runner based on the default' + ' strategy. For strategies that do not implement an' + ' incremental, the runner will use the default full backup.'), cfg.StrOpt('mount_point', default='/var/lib/postgresql', help="Filesystem path for mounting " "volumes if volume support is enabled."), |