Skip to content

Commit 3643305

Browse files
committed
GeneralService: bump up iter_min_period to 3.
1 parent c173eed commit 3643305

3 files changed

Lines changed: 26 additions & 39 deletions

File tree

genesis_core/cmd/gservice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def main():
5454

5555
engines.engine_factory.configure_postgresql_factory(CONF)
5656

57-
service = GeneralService(iter_min_period=1)
57+
service = GeneralService()
5858

5959
service.start()
6060

genesis_core/gservice/service.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363

6464

6565
class GeneralService(basic.BasicService):
66-
def __init__(self, iter_min_period=1, iter_pause=0.1):
67-
super().__init__(iter_min_period, iter_pause)
66+
def __init__(self, iter_min_period=3, iter_pause=0.1):
67+
super().__init__(iter_min_period=iter_min_period, iter_pause=iter_pause)
6868

6969
# TODO(akremenetsky): Form a pipliene from the configuration
7070
# and entry points
@@ -89,15 +89,14 @@ def __init__(self, iter_min_period=1, iter_pause=0.1):
8989
pool_weighters=pool_weighters,
9090
machine_filters=machine_filters,
9191
machine_weighters=machine_weighters,
92-
iter_min_period=1,
93-
iter_pause=0.1,
92+
iter_min_period=iter_min_period,
9493
)
95-
n_network = n_network_service.NetworkService(iter_min_period=1, iter_pause=0.1)
94+
n_network = n_network_service.NetworkService(iter_min_period=iter_min_period)
9695
node_builder = node_builder_svc.NodeBuilderService(
97-
iter_min_period=1, iter_pause=0.1
96+
iter_min_period=iter_min_period
9897
)
9998
volume_builder = volume_builder_svc.VolumeBuilderService(
100-
iter_min_period=1, iter_pause=0.1
99+
iter_min_period=iter_min_period
101100
)
102101
pool_driver = ua_pool_drivers.PoolAgentDriver(
103102
meta_file="/var/lib/genesis/genesis_core/pool_agent_meta.json"
@@ -125,7 +124,8 @@ def __init__(self, iter_min_period=1, iter_pause=0.1):
125124

126125
# Infra scheduler
127126
infra_scheduler = ua_scheduler_service.UniversalAgentSchedulerService(
128-
capabilities=["set_agent_node", "target_node_set"]
127+
capabilities=["set_agent_node", "target_node_set"],
128+
iter_min_period=iter_min_period,
129129
)
130130

131131
# Infra agent
@@ -171,35 +171,36 @@ def __init__(self, iter_min_period=1, iter_pause=0.1):
171171
pool_builder_service = pool_builder_svc.PoolBuilderService(
172172
uuid=sys_uuid.uuid5(ua_utils.system_uuid(), "pool_builder"),
173173
orch_client=orch_db.DatabaseOrchClient(),
174+
iter_min_period=iter_min_period,
174175
)
175176

176177
# ValuesStore
177178
vs_builder_service = vs_builder_svc.VSBuilderService(
178179
uuid=sys_uuid.uuid5(ua_utils.system_uuid(), "vs_builder"),
179180
orch_client=orch_db.DatabaseOrchClient(),
181+
iter_min_period=iter_min_period,
180182
)
181183

182-
cfg_service = config_service.ConfigServiceBuilder()
183-
secret_svc = secret_service.SecretServiceBuilder()
184-
event_sender = senders.EventSenderService.build_from_config()
185-
em_builder = em_builders.ElementManagerBuilder(
186-
iter_min_period=1, iter_pause=0.1
184+
cfg_service = config_service.ConfigServiceBuilder(
185+
iter_min_period=iter_min_period,
186+
)
187+
secret_svc = secret_service.SecretServiceBuilder(
188+
iter_min_period=iter_min_period,
187189
)
190+
event_sender = senders.EventSenderService.build_from_config()
191+
em_builder = em_builders.ElementManagerBuilder(iter_min_period=iter_min_period)
188192
janitor = janitor_service.ExpiredEmailConfirmationCodeJanitorService(
189193
iter_min_period=60 * 60,
190-
iter_pause=0,
191194
)
192195

193196
# Telemetry
194197
telemetry = telemetry_service.TelemetryService(
195198
iter_min_period=60 * 60,
196-
iter_pause=0,
197199
)
198200

199201
# DNS Sync
200202
dns_sync = dns_sync_service.DNSSyncService(
201-
iter_min_period=5,
202-
iter_pause=0,
203+
iter_min_period=iter_min_period * 2,
203204
)
204205

205206
self._services = [

genesis_core/tests/functional/restapi/iam/test_reset_password.py

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ def target_user(self, user_api_client, auth_user_admin):
3939
password=password,
4040
email="reset-pwd-target@test.com",
4141
)
42-
user_obj = iam_models.User.objects.get_one(
43-
filters={"uuid": user["uuid"]}
44-
)
42+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
4543
admin_client.confirm_email(
4644
user_uuid=user_obj.uuid,
4745
code=str(user_obj.confirmation_code),
@@ -60,9 +58,7 @@ def test_reset_password_with_valid_code_success(
6058
user, _ = target_user
6159
admin_client = user_api_client(auth_user_admin)
6260

63-
user_obj = iam_models.User.objects.get_one(
64-
filters={"uuid": user["uuid"]}
65-
)
61+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
6662
user_obj.create_confirmation_code()
6763
code = str(user_obj.confirmation_code)
6864

@@ -187,9 +183,7 @@ def target_user(self, user_api_client, auth_user_admin):
187183
password=password,
188184
email="send-reset-code@test.com",
189185
)
190-
user_obj = iam_models.User.objects.get_one(
191-
filters={"uuid": user["uuid"]}
192-
)
186+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
193187
admin_client.confirm_email(
194188
user_uuid=user_obj.uuid,
195189
code=str(user_obj.confirmation_code),
@@ -245,9 +239,7 @@ def test_send_reset_password_code_creates_confirmation_code(
245239
json={"email": user["email"]},
246240
)
247241

248-
user_obj = iam_models.User.objects.get_one(
249-
filters={"uuid": user["uuid"]}
250-
)
242+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
251243
assert user_obj.confirmation_code is not None
252244

253245
def test_send_reset_password_code_without_permission_forbidden(
@@ -320,9 +312,7 @@ def test_send_reset_password_code_then_reset_password_flow(
320312
permissions=[iam_c.PERMISSION_IAM_CLIENT_SEND_RESET_PASSWORD_CODE],
321313
)
322314

323-
user_obj = iam_models.User.objects.get_one(
324-
filters={"uuid": user["uuid"]}
325-
)
315+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
326316
original_secret_hash = user_obj.secret_hash
327317
assert user_obj.confirmation_code is None
328318

@@ -331,9 +321,7 @@ def test_send_reset_password_code_then_reset_password_flow(
331321
json={"email": user["email"]},
332322
)
333323

334-
user_obj = iam_models.User.objects.get_one(
335-
filters={"uuid": user["uuid"]}
336-
)
324+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
337325
assert user_obj.confirmation_code is not None
338326
code = str(user_obj.confirmation_code)
339327
new_password = "FlowNewPass1"
@@ -346,9 +334,7 @@ def test_send_reset_password_code_then_reset_password_flow(
346334
json={"new_password": new_password, "code": code},
347335
)
348336

349-
user_obj = iam_models.User.objects.get_one(
350-
filters={"uuid": user["uuid"]}
351-
)
337+
user_obj = iam_models.User.objects.get_one(filters={"uuid": user["uuid"]})
352338
assert user_obj.confirmation_code is None
353339
assert user_obj.secret_hash != original_secret_hash
354340

0 commit comments

Comments
 (0)