Skip to content

Commit

Permalink
Initialize auto-failover result keys correctly.
Browse files Browse the repository at this point in the history
Exclude 'count' which isn't a setting but the number of
times we've failed over. It is returned while querying
/settings/autoFailover.

Change-Id: I076ed72658ca1cf176f8a20243564047417695d4
Reviewed-on: https://review.couchbase.org/c/ns_server/+/209581
Tested-by: Neelima Premsankar <neelima.premsankar@couchbase.com>
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Well-Formed: Build Bot <build@couchbase.com>
  • Loading branch information
neelima32 committed May 7, 2024
1 parent c84d5fa commit b3f405a
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions cluster_tests/testsets/auto_failover_test.py
Expand Up @@ -36,12 +36,14 @@ def init_limits(self):
self.limits['failoverOnDataDiskIssues[timePeriod]']['min'] = 5
self.limits['failoverOnDataDiskIssues[timePeriod]']['max'] = 3600

def init_result_keys(self, keys):
self.result_keys = keys
self.result_keys.remove('count')

def setup(self):
self.endpoint = '/settings/autoFailover'
self.prev_settings = testlib.get(self.cluster, self.endpoint).json()
# count cannot be modified using this request
self.result_keys = list(self.prev_settings.keys())
self.result_keys.remove('count')
self.init_result_keys(list(self.prev_settings.keys()))
self.is_enterprise = self.cluster.is_enterprise
self.is_72 = self.cluster.is_72
self.is_76 = self.cluster.is_76
Expand Down Expand Up @@ -330,14 +332,14 @@ def validate_settings(self, testData, errors):
# maxCount will be pruned from queried settings
assert 'maxCount' in self.prev_settings
del self.prev_settings['maxCount']
self.result_keys = list(self.prev_settings.keys())
self.init_result_keys(list(self.prev_settings.keys()))
elif 'disableMaxCount' in delta and \
delta['disableMaxCount'] == 'false' and \
self.prev_settings['disableMaxCount']:
# maxCount will appear in the queried settings
assert 'maxCount' not in self.prev_settings
self.prev_settings['maxCount'] = resp.json()['maxCount']
self.result_keys = list(self.prev_settings.keys())
self.init_result_keys(list(self.prev_settings.keys()))

self.compare_settings(resp.json(), delta)
self.prev_settings = resp.json()
Expand Down

0 comments on commit b3f405a

Please sign in to comment.