Skip to content

Commit

Permalink
Issue #112 remove AggregatorConfig.partitioned_job_tracking
Browse files Browse the repository at this point in the history
replaced by `AggregatorBackendConfig.partitioned_job_tracking`
  • Loading branch information
soxofaan committed Mar 1, 2024
1 parent 2e7a272 commit 387837a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/openeo_aggregator/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ def __init__(self, backends: MultiBackendConnection, config: AggregatorConfig):
config=config,
)

if get_backend_config().partitioned_job_tracking or config.partitioned_job_tracking:
if get_backend_config().partitioned_job_tracking:
partitioned_job_tracker = PartitionedJobTracker.from_config(config=config, backends=self._backends)
else:
partitioned_job_tracker = None
Expand Down
3 changes: 0 additions & 3 deletions src/openeo_aggregator/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ class AggregatorConfig(dict):

config_source = dict_item()

# TODO #112 deprecated, instead use AggregatorBackendConfig.partitioned_job_tracking
partitioned_job_tracking = dict_item(default=None)

# TODO #112 Deprecated, use AggregatorBackendConfig.zookeeper_prefix instead
zookeeper_prefix = dict_item(default="/openeo-aggregator/")

Expand Down
2 changes: 1 addition & 1 deletion src/openeo_aggregator/partitionedjobs/zookeeper.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def __init__(self, client: KazooClient, prefix: str = None):
@classmethod
def from_config(cls, config: AggregatorConfig) -> "ZooKeeperPartitionedJobDB":
# Get ZooKeeper client
pjt_config = get_backend_config().partitioned_job_tracking or config.partitioned_job_tracking
pjt_config = get_backend_config().partitioned_job_tracking
if pjt_config.get("zk_client"):
zk_client = pjt_config["zk_client"]
elif pjt_config.get("zk_hosts"):
Expand Down

0 comments on commit 387837a

Please sign in to comment.