feat(controller): clusterconfig-schema-split task 1.2 — remove dead members from cluster_config_t
Deletes port, ncandidates, candidates/master_candidate_t**, vcpus, jobmgr, workermgr, qmgr, resmgr, xstrings members from cluster_config_t (and their now-orphaned supporting typedefs) to match the schema shrunk in task 1.1. Other .c files still referencing these members intentionally do not compile yet — that's tasks 2.1/2.2/2.3/3.
This commit is contained in:
parent
515248200a
commit
0205ac3cd2
2 changed files with 1 additions and 34 deletions
|
|
@ -10,7 +10,7 @@
|
||||||
- _Requirements: 1.1, 1.2, 1.6, 2.1, 3.1, 4.2_
|
- _Requirements: 1.1, 1.2, 1.6, 2.1, 3.1, 4.2_
|
||||||
- _Boundary: Schema Component_
|
- _Boundary: Schema Component_
|
||||||
|
|
||||||
- [ ] 1.2 Remove the matching members from `cluster_config_t`
|
- [x] 1.2 Remove the matching members from `cluster_config_t`
|
||||||
- Delete `port`, `ncandidates`, `candidates`/`master_candidate_t**`, `vcpus`, `jobmgr`, `workermgr`, `qmgr`, `resmgr`, `xstrings` members from `cluster_config_t` in `clusterconfig.h`
|
- Delete `port`, `ncandidates`, `candidates`/`master_candidate_t**`, `vcpus`, `jobmgr`, `workermgr`, `qmgr`, `resmgr`, `xstrings` members from `cluster_config_t` in `clusterconfig.h`
|
||||||
- Leave all retained members (matching the schema's surviving 13 fields) untouched
|
- Leave all retained members (matching the schema's surviving 13 fields) untouched
|
||||||
- Observable: `clusterconfig.h`'s field list matches the regenerated schema field-for-field; any remaining reference to a removed member elsewhere in the tree is now a compile error, not a silent gap
|
- Observable: `clusterconfig.h`'s field list matches the regenerated schema field-for-field; any remaining reference to a removed member elsewhere in the tree is now a compile error, not a silent gap
|
||||||
|
|
|
||||||
|
|
@ -4,40 +4,12 @@
|
||||||
|
|
||||||
#include "xce/types.h"
|
#include "xce/types.h"
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int nhash_slots;
|
|
||||||
int delta;
|
|
||||||
} hash_zarray_config_t;
|
|
||||||
|
|
||||||
typedef hash_zarray_config_t jobmgr_config_t;
|
|
||||||
|
|
||||||
typedef hash_zarray_config_t workermgr_config_t;
|
|
||||||
typedef hash_zarray_config_t qmgr_config_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int nhash_slots;
|
|
||||||
int delta;
|
|
||||||
int inst_delta;
|
|
||||||
} resmgr_config_t;
|
|
||||||
|
|
||||||
typedef hash_zarray_config_t xstrings_config_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
char* name;
|
|
||||||
char* host;
|
|
||||||
int port;
|
|
||||||
} master_candidate_t;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char* clustername;
|
char* clustername;
|
||||||
int port;
|
|
||||||
int ncandidates;
|
|
||||||
master_candidate_t** candidates;
|
|
||||||
int heartbeat_interval;
|
int heartbeat_interval;
|
||||||
int inactive_heartbeat_count;
|
int inactive_heartbeat_count;
|
||||||
int fetch_job_interval;
|
int fetch_job_interval;
|
||||||
int netio_timeout;
|
int netio_timeout;
|
||||||
int vcpus; /* deprecated: use --vcpus CLI flag; kept for config blob backward compatibility */
|
|
||||||
int nres;
|
int nres;
|
||||||
xce_resource_t** resources;
|
xce_resource_t** resources;
|
||||||
int nqueues;
|
int nqueues;
|
||||||
|
|
@ -48,11 +20,6 @@ typedef struct {
|
||||||
xce_group_config_t** hgroups;
|
xce_group_config_t** hgroups;
|
||||||
int nhconfigs;
|
int nhconfigs;
|
||||||
xce_hostconfig_t** hconfigs;
|
xce_hostconfig_t** hconfigs;
|
||||||
jobmgr_config_t* jobmgr;
|
|
||||||
workermgr_config_t* workermgr;
|
|
||||||
qmgr_config_t* qmgr;
|
|
||||||
resmgr_config_t* resmgr;
|
|
||||||
xstrings_config_t* xstrings;
|
|
||||||
int nhproviders;
|
int nhproviders;
|
||||||
scaler_config_t** hproviders;
|
scaler_config_t** hproviders;
|
||||||
int nlimits;
|
int nlimits;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue