Skip to content

Commit 2174e6c

Browse files
committed
AER-6836 - Fixed startup race initializing the 'mrt_monitor_hash'.
1 parent 30630ed commit 2174e6c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

as/include/base/mrt_monitor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typedef struct monitor_roll_origin_s {
7171
// Public API.
7272
//
7373

74-
void as_mrt_monitor_start(void);
74+
void as_mrt_monitor_init(void);
7575

7676
bool as_mrt_monitor_is_monitor_set_id(const struct as_namespace_s* ns, uint32_t set_id);
7777
bool as_mrt_monitor_is_monitor_record(const struct as_namespace_s* ns, const struct as_index_s* r);

as/src/base/as.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,9 @@ as_run(int argc, char **argv)
354354
// initialized.
355355
as_namespaces_init(cold_start_cmd, instance);
356356

357+
// Relevant for enterprise edition only.
358+
as_mrt_monitor_init();
359+
357360
// Initialize the storage system. For warm restarts, this includes fully
358361
// resuming persisted indexes.
359362
as_storage_init();
@@ -421,7 +424,6 @@ as_run(int argc, char **argv)
421424
as_ticker_start(); // only after everything else is started
422425

423426
// Relevant for enterprise edition only.
424-
as_mrt_monitor_start();
425427
as_storage_start_tomb_raider();
426428

427429
// Log a service-ready message.

as/src/base/mrt_monitor_ce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
//
4545

4646
void
47-
as_mrt_monitor_start(void)
47+
as_mrt_monitor_init(void)
4848
{
4949
}
5050

0 commit comments

Comments
 (0)