Skip to content

scripts: Remove references to not longer existing configs and rename script to reflect that #10415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main-v0.14.1
Choose a base branch
from
+7 −18
Draft

scripts: Remove references to not longer existing configs and rename script to reflect that #10415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions scripts/prod/restart_all_cores.py → ...s/prod/take_nodes_out_of_observer_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from restarter_lib import ServiceRestarter
from update_config_and_restart_nodes_lib import (
ApolloArgsParserBuilder,
ConstConfigValuesUpdater,
ConfigValuesUpdater,
get_configmap,
get_current_block_number,
get_logs_explorer_url,
Expand Down Expand Up @@ -43,15 +43,14 @@ def get_validator_id(namespace: str, context: Optional[str]) -> str:
return config_data["validator_id"]


class NodeValidatorIdCompositeUpdater(ConstConfigValuesUpdater):
def __init__(self, config_overrides: dict[str, any], validator_id_start_from: int):
super().__init__(config_overrides)
class NodeValidatorIdUpdater(ConfigValuesUpdater):
def __init__(self, validator_id_start_from: int):
self.validator_id_start_from = validator_id_start_from

def get_updated_config_for_instance(
self, config_data: dict[str, any], instance_index: int
) -> dict[str, any]:
updated_config = super().get_updated_config_for_instance(config_data, instance_index)
updated_config = config_data.copy()
validator_id_as_hex = hex(self.validator_id_start_from + instance_index)
updated_config["validator_id"] = validator_id_as_hex
return updated_config
Expand Down Expand Up @@ -105,8 +104,9 @@ def main():

args_builder.add_argument(
"--validator-id-start-from",
required=True,
type=int,
help="If set, also update the validator ID config to this value + index of the instance being restarted. Value is in decimal format.",
help="Update the validator ID config to this value + index of the instance being restarted. Value is in decimal format.",
)

args = args_builder.build()
Expand All @@ -118,11 +118,6 @@ def main():
print_colored(f"Current block number: {current_block_number}")
print_colored(f"Next block number: {next_block_number}")

config_overrides = {
"consensus_manager_config.cende_config.skip_write_height": next_block_number,
"consensus_manager_config.immediate_active_height": next_block_number,
}

namespace_list = NamespaceAndInstructionArgs.get_namespace_list_from_args(args)
context_list = NamespaceAndInstructionArgs.get_context_list_from_args(args)

Expand Down Expand Up @@ -152,14 +147,8 @@ def main():
Service.Core,
)

updater = (
NodeValidatorIdCompositeUpdater(config_overrides, args.validator_id_start_from)
if args.validator_id_start_from
else ConstConfigValuesUpdater(config_overrides)
)

update_config_and_restart_nodes(
updater,
NodeValidatorIdUpdater(args.validator_id_start_from),
namespace_and_instruction_args,
Service.Core,
restarter,
Expand Down