Browse Source

Don't try to grab stats from ckdbq in standalone mode

master
ckolivas 10 years ago
parent
commit
71e6481dc6
  1. 6
      src/stratifier.c

6
src/stratifier.c

@ -1629,7 +1629,7 @@ static void ckmsgq_stats(ckmsgq_t *ckmsgq, int size, json_t **val)
JSON_CPACK(*val, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated); JSON_CPACK(*val, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated);
} }
static char *stratifier_stats(sdata_t *sdata) static char *stratifier_stats(ckpool_t *ckp, sdata_t *sdata)
{ {
json_t *val = json_object(), *subval; json_t *val = json_object(), *subval;
int objects, generated; int objects, generated;
@ -1685,8 +1685,10 @@ static char *stratifier_stats(sdata_t *sdata)
/* Don't know exactly how big the string is so just count the pointer for now */ /* Don't know exactly how big the string is so just count the pointer for now */
ckmsgq_stats(sdata->srecvs, sizeof(char *), &subval); ckmsgq_stats(sdata->srecvs, sizeof(char *), &subval);
json_set_object(val, "srecvs", subval); json_set_object(val, "srecvs", subval);
if (!CKP_STANDALONE(ckp)) {
ckmsgq_stats(sdata->ckdbq, sizeof(char *), &subval); ckmsgq_stats(sdata->ckdbq, sizeof(char *), &subval);
json_set_object(val, "ckdbq", subval); json_set_object(val, "ckdbq", subval);
}
ckmsgq_stats(sdata->stxnq, sizeof(json_params_t), &subval); ckmsgq_stats(sdata->stxnq, sizeof(json_params_t), &subval);
json_set_object(val, "stxnq", subval); json_set_object(val, "stxnq", subval);
@ -1765,7 +1767,7 @@ retry:
char *msg; char *msg;
LOGDEBUG("Stratifier received stats request"); LOGDEBUG("Stratifier received stats request");
msg = stratifier_stats(sdata); msg = stratifier_stats(ckp, sdata);
send_unix_msg(sockd, msg); send_unix_msg(sockd, msg);
Close(sockd); Close(sockd);
goto retry; goto retry;

Loading…
Cancel
Save