external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5819 from citusdata/turn_metadata_sync_on_in_arbitrary_tests 

Refactor arbitrary configs to make MX more explicit
pull/5842/head
Halil Ozan Akgül 2022-03-23 17:44:47 +03:00 committed by GitHub
parent 3a44fa827a c843ebe48e
commit 40f3fbbc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/test/regress/citus_tests/config.py
View File

@ -58,10 +58,7 @@ port_lock = threading.Lock()
def should_include_config(class_name): def should_include_config(class_name):
if inspect.isclass(class_name) and ( if inspect.isclass(class_name) and issubclass(class_name, CitusDefaultClusterConfig):
issubclass(class_name, CitusMXBaseClusterConfig)
or issubclass(class_name, CitusDefaultClusterConfig)
):
return True return True
return False return False
@ -97,7 +94,7 @@ class CitusBaseClusterConfig(object, metaclass=NewInitCaller):
self.temp_dir = CITUS_ARBITRARY_TEST_DIR self.temp_dir = CITUS_ARBITRARY_TEST_DIR
self.worker_amount = 2 self.worker_amount = 2
self.user = REGULAR_USER_NAME self.user = REGULAR_USER_NAME
self.is_mx = False self.is_mx = True
self.is_citus = True self.is_citus = True
self.name = type(self).__name__ self.name = type(self).__name__
self.settings = { self.settings = {
@ -168,12 +165,6 @@ class CitusDefaultClusterConfig(CitusBaseClusterConfig):
self.add_coordinator_to_metadata = True self.add_coordinator_to_metadata = True
class CitusMXBaseClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments):
super().__init__(arguments)
self.is_mx = True
class CitusUpgradeConfig(CitusBaseClusterConfig): class CitusUpgradeConfig(CitusBaseClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
@ -184,6 +175,7 @@ class CitusUpgradeConfig(CitusBaseClusterConfig):
self.user = SUPER_USER_NAME self.user = SUPER_USER_NAME
self.mixed_mode = arguments["--mixed"] self.mixed_mode = arguments["--mixed"]
self.fixed_port = 57635 self.fixed_port = 57635
self.is_mx = False
class PostgresConfig(CitusDefaultClusterConfig): class PostgresConfig(CitusDefaultClusterConfig):
@ -205,19 +197,19 @@ class CitusSingleNodeClusterConfig(CitusDefaultClusterConfig):
common.coordinator_should_haveshards(self.bindir, self.coordinator_port()) common.coordinator_should_haveshards(self.bindir, self.coordinator_port())
class CitusSingleWorkerClusterConfig(CitusMXBaseClusterConfig): class CitusSingleWorkerClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.worker_amount = 1 self.worker_amount = 1
class CitusSuperUserDefaultClusterConfig(CitusMXBaseClusterConfig): class CitusSuperUserDefaultClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.user = SUPER_USER_NAME self.user = SUPER_USER_NAME
class CitusThreeWorkersManyShardsClusterConfig(CitusMXBaseClusterConfig): class CitusThreeWorkersManyShardsClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = {"citus.shard_count": 191} self.new_settings = {"citus.shard_count": 191}
@ -227,7 +219,7 @@ class CitusThreeWorkersManyShardsClusterConfig(CitusMXBaseClusterConfig):
common.coordinator_should_haveshards(self.bindir, self.coordinator_port()) common.coordinator_should_haveshards(self.bindir, self.coordinator_port())
class CitusSmallSharedPoolSizeConfig(CitusMXBaseClusterConfig): class CitusSmallSharedPoolSizeConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -236,7 +228,7 @@ class CitusSmallSharedPoolSizeConfig(CitusMXBaseClusterConfig):
} }
class CitusSmallExecutorPoolSizeConfig(CitusMXBaseClusterConfig): class CitusSmallExecutorPoolSizeConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -244,7 +236,7 @@ class CitusSmallExecutorPoolSizeConfig(CitusMXBaseClusterConfig):
} }
class CitusSequentialExecutionConfig(CitusMXBaseClusterConfig): class CitusSequentialExecutionConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -252,7 +244,7 @@ class CitusSequentialExecutionConfig(CitusMXBaseClusterConfig):
} }
class CitusCacheManyConnectionsConfig(CitusMXBaseClusterConfig): class CitusCacheManyConnectionsConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -260,7 +252,7 @@ class CitusCacheManyConnectionsConfig(CitusMXBaseClusterConfig):
} }
class CitusUnusualExecutorConfig(CitusMXBaseClusterConfig): class CitusUnusualExecutorConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -281,7 +273,7 @@ class CitusUnusualExecutorConfig(CitusMXBaseClusterConfig):
self.env_variables = {'PGAPPNAME' : 'test_app'} self.env_variables = {'PGAPPNAME' : 'test_app'}
class CitusSmallCopyBuffersConfig(CitusMXBaseClusterConfig): class CitusSmallCopyBuffersConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -291,7 +283,7 @@ class CitusSmallCopyBuffersConfig(CitusMXBaseClusterConfig):
} }
class CitusUnusualQuerySettingsConfig(CitusMXBaseClusterConfig): class CitusUnusualQuerySettingsConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = { self.new_settings = {
@ -316,19 +308,19 @@ class CitusSingleNodeSingleShardClusterConfig(CitusDefaultClusterConfig):
common.coordinator_should_haveshards(self.bindir, self.coordinator_port()) common.coordinator_should_haveshards(self.bindir, self.coordinator_port())
class CitusShardReplicationFactorClusterConfig(CitusMXBaseClusterConfig): class CitusShardReplicationFactorClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = {"citus.shard_replication_factor": 2} self.new_settings = {"citus.shard_replication_factor": 2}
class CitusSingleShardClusterConfig(CitusMXBaseClusterConfig): class CitusSingleShardClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.new_settings = {"citus.shard_count": 1} self.new_settings = {"citus.shard_count": 1}
class CitusNonMxClusterConfig(CitusMXBaseClusterConfig): class CitusNonMxClusterConfig(CitusDefaultClusterConfig):
def __init__(self, arguments): def __init__(self, arguments):
super().__init__(arguments) super().__init__(arguments)
self.is_mx = False self.is_mx = False