From 0205ac3cd221ac69aa3d2e8acb8c65cc97bd30df Mon Sep 17 00:00:00 2001
From: Rongsong Shen <rshen@shenrs.eu>
Date: Tue, 21 Jul 2026 03:13:33 +0000
Subject: [PATCH] =?UTF-8?q?feat(controller):=20clusterconfig-schema-split?=
 =?UTF-8?q?=20task=201.2=20=E2=80=94=20remove=20dead=20members=20from=20cl?=
 =?UTF-8?q?uster=5Fconfig=5Ft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 .../specs/clusterconfig-schema-split/tasks.md |  2 +-
 src/include/clusterconfig.h                   | 33 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/.kiro/specs/clusterconfig-schema-split/tasks.md b/.kiro/specs/clusterconfig-schema-split/tasks.md
index 572c8bd1..1b651a15 100644
--- a/.kiro/specs/clusterconfig-schema-split/tasks.md
+++ b/.kiro/specs/clusterconfig-schema-split/tasks.md
@@ -10,7 +10,7 @@
   - _Requirements: 1.1, 1.2, 1.6, 2.1, 3.1, 4.2_
   - _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`
   - 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
diff --git a/src/include/clusterconfig.h b/src/include/clusterconfig.h
index 10ead440..2a6333fd 100644
--- a/src/include/clusterconfig.h
+++ b/src/include/clusterconfig.h
@@ -4,40 +4,12 @@
 
 #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 {
     char*                clustername;
-    int                  port;
-    int                  ncandidates;
-    master_candidate_t** candidates;
     int                  heartbeat_interval;
     int                  inactive_heartbeat_count;
     int                  fetch_job_interval;
     int                  netio_timeout;
-    int                  vcpus;           /* deprecated: use --vcpus CLI flag; kept for config blob backward compatibility */
     int                  nres;
     xce_resource_t**     resources;
     int                  nqueues;
@@ -48,11 +20,6 @@ typedef struct {
     xce_group_config_t** hgroups;
     int                  nhconfigs;
     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;
     scaler_config_t**    hproviders;
     int                  nlimits;