save works
This commit is contained in:
parent
f4b1ba4cd7
commit
acfbec875b
51 changed files with 622 additions and 1175 deletions
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "cluster.h"
|
||||
#include "controller.capnp.h"
|
||||
#include "objmgr.h"
|
||||
#include "request.h"
|
||||
#include "xce/types.h"
|
||||
#include "xstring.h"
|
||||
|
|
@ -27,16 +26,19 @@ static int xce_apiserver_push_workers(cluster_t* c, endpoint_t* ep)
|
|||
xce_data_t data;
|
||||
xce_workers_data_t workers
|
||||
= { .n_total = 0, .pos = 0, .count = 0, .workers = NULL };
|
||||
int i, rc = 0;
|
||||
int i, rc = 0;
|
||||
xlist_t wlist;
|
||||
|
||||
memset(&data, 0x0, sizeof(data));
|
||||
xlist_init(&wlist, 8192);
|
||||
|
||||
data.table = Data_data_workers;
|
||||
data.data.workers = &workers;
|
||||
|
||||
collect_workers(c, (collect_check_fn_t)check_worker_, &(workers.n_total),
|
||||
&(workers.workers));
|
||||
workers.count = workers.n_total;
|
||||
collect_workers(c, (collect_check_fn_t)check_worker_, &wlist);
|
||||
workers.n_total = wlist.count;
|
||||
workers.workers = (xce_worker_t**)wlist.data;
|
||||
workers.count = workers.n_total;
|
||||
|
||||
rc = xce_push_data_req(ep, c->myhost, &data, check_controller, c, 100);
|
||||
|
||||
|
|
@ -49,7 +51,8 @@ static int xce_apiserver_push_workers(cluster_t* c, endpoint_t* ep)
|
|||
free_resval_with_idx_list(&(w->resvals_to_sched), w->nresvals_to_sched);
|
||||
}
|
||||
|
||||
deref_objs(workers.n_total, (void**)workers.workers);
|
||||
unlock_collect_workers(&wlist);
|
||||
|
||||
FREEUP(workers.workers);
|
||||
|
||||
return rc;
|
||||
|
|
@ -69,18 +72,23 @@ static int xce_apiserver_push_jobs(cluster_t* c, endpoint_t* ep)
|
|||
xce_data_t data;
|
||||
xce_jobs_data_t jobs = { .n_total = 0, .pos = 0, .count = 0, .jobs = NULL };
|
||||
int rc = 0;
|
||||
xlist_t jlist;
|
||||
|
||||
memset(&data, 0x0, sizeof(data));
|
||||
xlist_init(&jlist, 1024 * 1024);
|
||||
|
||||
data.table = Data_data_jobs;
|
||||
data.data.jobs = &jobs;
|
||||
|
||||
collect_jobs(c, (collect_check_fn_t)check_job_, &(jobs.n_total),
|
||||
&(jobs.jobs));
|
||||
jobs.count = jobs.n_total;
|
||||
collect_jobs(c, (collect_check_fn_t)check_job_, &jlist);
|
||||
jobs.n_total = jlist.count;
|
||||
jobs.jobs = (xce_job_t**)jlist.data;
|
||||
jobs.count = jobs.n_total;
|
||||
|
||||
rc = xce_push_data_req(ep, c->myhost, &data, check_controller, c, 100);
|
||||
deref_objs(jobs.n_total, (void**)jobs.jobs);
|
||||
|
||||
unlock_collect_jobs(&jlist);
|
||||
|
||||
FREEUP(jobs.jobs);
|
||||
|
||||
return rc;
|
||||
|
|
@ -256,7 +264,7 @@ static int apiserver_job_update_fun(int type, int situation, void* data,
|
|||
int rc;
|
||||
xce_notify_data_t xdata
|
||||
= { .event = NotifyData_data_updateJob,
|
||||
.data = { .update_job = &(job->job) } };
|
||||
.data = { .update_job = &(job->job) } };
|
||||
|
||||
rc = notify(c, c->apiservers[i].ep, &xdata);
|
||||
if (rc < 0) {
|
||||
|
|
@ -349,13 +357,16 @@ static int apiserver_push_workerlist(cluster_t* c, endpoint_t* ep, xlist_t* l)
|
|||
static int apiserver_worker_change(int type, int situation, void* data,
|
||||
cluster_t* c, worker_t* w)
|
||||
{
|
||||
int i;
|
||||
int i;
|
||||
xlist_t resvalist;
|
||||
|
||||
TRACE("%s worker %s idx %d situation %d", __func__, w->host.name, w->idx,
|
||||
situation);
|
||||
|
||||
collect_resval_with_idx(&(w->host.resvals), &(w->host.nresvals_to_sched),
|
||||
&(w->host.resvals_to_sched));
|
||||
xlist_init(&resvalist, 256);
|
||||
collect_resval_with_idx(&(w->host.resvals), &resvalist);
|
||||
w->host.nresvals_to_sched = resvalist.count;
|
||||
w->host.resvals_to_sched = (xce_val_with_idx_t**)resvalist.data;
|
||||
|
||||
switch (situation) {
|
||||
case HOOK_AFTER_EVENT:
|
||||
|
|
@ -383,8 +394,11 @@ static int apiserver_worker_change(int type, int situation, void* data,
|
|||
break;
|
||||
}
|
||||
|
||||
#if 0
|
||||
free_resval_with_idx_list(&(w->host.resvals_to_sched),
|
||||
w->host.nresvals_to_sched);
|
||||
#endif
|
||||
xlist_fini(&resvalist);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -514,7 +528,7 @@ static int apiserver_queue_hook_fun(int type, int situation, int detail,
|
|||
int rc;
|
||||
xce_notify_data_t xdata
|
||||
= { .event = NotifyData_data_schedUpdateQueue,
|
||||
.data = { .sched_update_queue = &(q->queue) } };
|
||||
.data = { .sched_update_queue = &(q->queue) } };
|
||||
|
||||
rc = notify(c, c->apiservers[i].ep, &xdata);
|
||||
if (rc < 0) {
|
||||
|
|
@ -585,7 +599,6 @@ int handle_apiserver_leave(cluster_t* c, endpoint_t* ep)
|
|||
}
|
||||
|
||||
if (c->apiservers[i].name != NULL) {
|
||||
obj_deref(c->apiservers[i].name);
|
||||
c->apiservers[i].ep = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue