lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(controller): use hardcoded defaults for perf-tuning params

Browse source 
Replace cluster_config-dependent hash sizes with compile-time constants
(CTRL_PERF_NHASH=512, CTRL_PERF_DELTA=64, CTRL_PERF_INST=64) for:
  jobmgr, workermgr, qmgr, resmgr, xstrings

These are controller performance tuning parameters (capnp fields @13–@17)
that have no config generation tool yet. Using hardcoded defaults unblocks
cluster startup without requiring these fields in the config blob.

TODO: wire back to cluster_config once config generation tool is ready.
This commit is contained in:
Rongsong Shen 2026-05-30 01:07:56 +00:00
parent 47c09d653c
commit 5f1af48d57
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controller/cluster.c
View file

@ -820,19 +820,23 @@ int cluster_init_phase2(cluster_t* c)
mylock_init(&(c->sched.lock));
c->sched.ep = NULL;
resmgr_params.nslots = c->myconf->cluster_config->resmgr->nhash_slots;
resmgr_params.delta = c->myconf->cluster_config->resmgr->delta;
jobmgr_params.nslots = c->myconf->cluster_config->jobmgr->nhash_slots;
jobmgr_params.delta = c->myconf->cluster_config->jobmgr->delta;
workermgr_params.nslots = c->myconf->cluster_config->workermgr->nhash_slots;
workermgr_params.delta = c->myconf->cluster_config->workermgr->delta;
qmgr_params.nslots = c->myconf->cluster_config->qmgr->nhash_slots;
qmgr_params.delta = c->myconf->cluster_config->qmgr->delta;
/* TODO: replace with config-driven values once config generation tool is ready */
#define CTRL_PERF_NHASH 512
#define CTRL_PERF_DELTA 64
#define CTRL_PERF_INST 64
resmgr_params.nslots = CTRL_PERF_NHASH;
resmgr_params.delta = CTRL_PERF_DELTA;
jobmgr_params.nslots = CTRL_PERF_NHASH;
jobmgr_params.delta = CTRL_PERF_DELTA;
workermgr_params.nslots = CTRL_PERF_NHASH;
workermgr_params.delta = CTRL_PERF_DELTA;
qmgr_params.nslots = CTRL_PERF_NHASH;
qmgr_params.delta = CTRL_PERF_DELTA;
c->configmgr = makeInstance(&xkvmgr_type, &config_mgr_params);
c->jobmgr = makeInstance(&xkvmgr_type, &jobmgr_params);
c->resmgr = makeInstance(&xkvmgr_type, &resmgr_params);
zarray_init(&(c->sharedinst), c->myconf->cluster_config->resmgr->inst_delta,
zarray_init(&(c->sharedinst), CTRL_PERF_INST,
(zarray_item_killer_t)resval_obj_killer);
c->workermgr = makeInstance(&xkvmgr_type, &workermgr_params);
c->qmgr = makeInstance(&xkvmgr_type, &qmgr_params);
@ -848,7 +852,7 @@ int cluster_init_phase2(cluster_t* c)
iomgr_set_ssl_ctx(&(c->iomgr), ssl_ctx);
}
xstring_table_init(c->myconf->cluster_config->xstrings->nhash_slots);
xstring_table_init(CTRL_PERF_NHASH);
job_obj_init(5381, 5381);
zarray_init(&(c->endpoints), 16, endpoint_killer);