Changeset e781d1eba05c6dd4520aec7f96642bc77a0f9de1

Timestamp:

02/15/08 17:14:47 (9 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1203095687 +0000

git-parent:

[129a0bae7c19dce74dfb70efd8e069b47209c6d8]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1203095687 +0000

Message:

oh dear, check creation?!

Files:

• src/noit_check.c (modified) (6 diffs)
• src/noit_conf.c (modified) (21 diffs)
• src/noit_conf.h (modified) (1 diff)
• src/sample.conf (modified) (1 diff)

src/noit_check.c

@@ -156 +156 @@
-    options = noit_conf_get_hash(sec[i], "ancestor-or-self::node()/config/*");
-
+    INHERIT(boolean, disable, &disabled);
-    flags = 0;
-    if(busted) flags |= NP_UNCONFIG;
@@ -162 +163 @@
-    if(noit_hash_retrieve(&polls, (char *)uuid, UUID_SIZE,
-                          (void **)&existing_check)) {
+      /* Once set, we can never change it. */
+      assert(!existing_check->module || !existing_check->module[0] ||
+             !strcmp(existing_check->module, module));
+      /* Only set it if it is not yet set */
+      if(!existing_check->module || !existing_check->module[0]) {
+        if(existing_check->module) free(existing_check->module);
+        existing_check->module = strdup(module);
+      }
-      noit_check_update(existing_check, target, name, options,
-                           period, timeout, oncheck[0] ? oncheck : NULL,
@@ -203 +212 @@
-
-void
+noit_poller_flush_epoch(int oldest_allowed) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  uuid_t key_id;
+  int klen;
+  noit_check_t *check, *tofree = NULL;
+
+  /* Cleanup any previous causal map */
+  while(noit_hash_next(&polls, &iter, (const char **)key_id, &klen,
+                       (void **)&check)) {
+    /* We don't free the one we're looking at... we free it on the next
+     * pass.  This leaves out iterator in good shape.  We just need to
+     * remember to free it one last time outside the while loop, down...
+     */
+    if(tofree) {
+      noit_poller_deschedule(tofree->checkid);
+      tofree = NULL;
+    }
+    if(check->generation < oldest_allowed) {
+      tofree = check;
+    }
+  }
+  /* ... here */
+  if(tofree) noit_poller_deschedule(tofree->checkid);
+}
+
+void
-noit_poller_make_causal_map() {
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
@@ -219 +254 @@
-  }
-
+  memset(&iter, 0, sizeof(iter));
-  /* Walk all checks and add check dependencies to their parents */
-  while(noit_hash_next(&polls, &iter, (const char **)key_id, &klen,
@@ -228 +264 @@
-      char *target = NULL;
-
+      noitL(noit_debug, "Searching for upstream trigger on %s\n", name);
-      if((target = strchr(check->oncheck, '`')) != NULL) {
-        strlcpy(fullcheck, check->oncheck, target - check->oncheck);
@@ -258 +295 @@
-{
-  noit_poller_process_checks(xpath ? xpath : "/noit/checks//check");
+  if(!xpath) {
+    /* Full reload, we need to wipe old checks */
+    noit_poller_flush_epoch(__config_load_generation);
+  }
-  noit_poller_make_causal_map();
-  noit_poller_initiate();

src/noit_conf.c

@@ -67 +67 @@
-    master_config = new_config;
-    xpath_ctxt = xmlXPathNewContext(master_config);
-
+if(path != master_config_file) 
-    return 0;
-  }
@@ -202 +202 @@
-  return 1;
-}
+int noit_conf_get_uuid(noit_conf_section_t section,
+                       const char *path, uuid_t out) {
+  char *str;
+  if(_noit_conf_get_string(section,NULL,path,&str)) {
+    if(uuid_parse(str, out) == 0) return 1;
+    return 0;
+  }
+  return 0;
+}
-int noit_conf_get_string(noit_conf_section_t section,
-                         const char *path, char **value) {
@@ -313 +322 @@
-  char argcopy[1024], *target, *name;
-
-
+
+
+
-  if(uuid_parse(argcopy, checkid) == 0) {
-    /* If they kill by uuid, we'll seek and destroy -- find it anywhere */
@@ -334 +345 @@
-  else {
-    char *path = (!info || !strcmp(info->path, "/")) ? "" : info->path;
-
+
+
-  }
-  return 0;
@@ -358 +370 @@
-  nc_write(ncct, "\n", 1);
-}
+static void 
+refresh_subchecks(noit_console_closure_t ncct,
+                  noit_conf_t_userdata_t *info) {
+  char *path;
+  char xpath[1024];
+ 
+  path = info->path;
+  if(!strcmp(path, "/")) path = "";
+
+  /* The first one is just a process_checks, the second is the reload.
+   * Reload does a lot of work and there is no need to do it twice.
+   */
+  snprintf(xpath, sizeof(xpath), "/noit/%s[@uuid]", path);
+  noit_poller_process_checks(xpath);
+  snprintf(xpath, sizeof(xpath), "/noit/%s//check[@uuid]", path);
+  noit_poller_reload(xpath);
+}
+static int
+noit_conf_mkcheck_under(const char *ppath, uuid_t out) {
+  int rv = -1;
+  const char *path;
+  char xpath[1024];
+  xmlXPathObjectPtr pobj = NULL;
+  xmlNodePtr node = NULL, newnode;
+
+  path = strcmp(ppath, "/") ? ppath : "";
+  snprintf(xpath, sizeof(xpath), "/noit%s", path);
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetGetLength(pobj->nodesetval) != 1) {
+    goto out;
+  }
+  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+  if((newnode = xmlNewChild(node, NULL, (xmlChar *)"check", NULL)) != NULL) {
+    char outstr[37];
+    uuid_generate(out);
+    uuid_unparse_lower(out, outstr);
+    xmlSetProp(newnode, (xmlChar *)"uuid", (xmlChar *)outstr);
+    rv = 0;
+  }
+ out:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return rv;
+}
-static int
-noit_console_check(noit_console_closure_t ncct,
-                   int argc, char **argv,
-                   noit_console_state_t *state, void *closure) {
-i, 
+
-  noit_conf_t_userdata_t *info;
-
+
+
+
-  xmlXPathObjectPtr pobj = NULL;
+  xmlNodePtr node = NULL;
+  noit_conf_boolean creating_new = noit_false;
-
-  if(argc > 1) {
@@ -373 +433 @@
-
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  wanted = argc ? argv[0] : NULL;
+  if(!wanted) {
+    /* We are creating a new node */
+    uuid_t out;
+    creating_new = noit_true;
+    if(noit_conf_mkcheck_under(info->path, out)) {
+      nc_printf(ncct, "Error creating new check\n");
+      return -1;
+    }
+    newuuid_str[0] = '\0';
+    uuid_unparse_lower(out, newuuid_str);
+    wanted = newuuid_str;
+  }
-  /* We many not be in conf-t mode -- that's fine */
-
-
-
+
+
-    return -1;
-  }
@@ -391 +463 @@
-    goto out;
-  }
+  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+  uuid_conf = (char *)xmlGetProp(node, (xmlChar *)"uuid");
+  if(!uuid_conf || uuid_parse(uuid_conf, checkid)) {
+    nc_printf(ncct, "%s has invalid or missing UUID!\n",
+              (char *)xmlGetNodePath(node) + strlen("/noit"));
+    goto out;
+  }
+  if(info) {
+    if(info->path) free(info->path);
+    info->path = strdup((char *)xmlGetNodePath(node) + strlen("/noit"));
+    uuid_copy(info->current_check, checkid);
+    if(creating_new) refresh_subchecks(ncct, info);
+    noit_console_state_push_state(ncct, state);
+    noit_console_state_init(ncct);
+    goto out;
+  }
+ out:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return 0;
+}
+static int
+noit_console_show_check(noit_console_closure_t ncct,
+                        int argc, char **argv,
+                        noit_console_state_t *state, void *closure) {
+  int i, cnt;
+  noit_conf_t_userdata_t *info;
+  char xpath[1024];
+  xmlXPathObjectPtr pobj = NULL;
+
+  if(argc > 1) {
+    nc_printf(ncct, "requires zero or one arguments\n");
+    return -1;
+  }
+
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  /* We many not be in conf-t mode -- that's fine */
+  if(noit_console_mkcheck_xpath(xpath, sizeof(xpath), info,
+                                argc ? argv[0] : NULL)) {
+    nc_printf(ncct, "could not find check '%s'\n", argv[0]);
+    return -1;
+  }
+
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    nc_printf(ncct, "no checks found\n");
+    goto out;
+  }
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  if(info && cnt != 1) {
+    nc_printf(ncct, "Ambiguous check specified\n");
+    goto out;
+  }
-  for(i=0; i<cnt; i++) {
-    uuid_t checkid;
+    noit_check_t *check;
-    xmlNodePtr node, anode, mnode = NULL;
-    char *uuid_conf;
@@ -398 +524 @@
-
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
-    if(info) {
-      if(info->path) free(info->path);
-      info->path = strdup((char *)xmlGetNodePath(node) + strlen("/noit"));
-    }
-    uuid_conf = (char *)xmlGetProp(node, (xmlChar *)"uuid");
-    if(!uuid_conf || uuid_parse(uuid_conf, checkid)) {
@@ -430 +552 @@
-    SHOW_ATTR(timeout);
-    SHOW_ATTR(oncheck);
+    SHOW_ATTR(disable);
+    check = noit_poller_lookup(checkid);
+    if(!check) {
+      nc_printf(ncct, " ERROR: not in running system\n");
+    }
+    else {
+      int idx = 0;
+      nc_printf(ncct, " currently: ");
+      if(NOIT_CHECK_RUNNING(check)) nc_printf(ncct, "%srunning", idx++?",":"");
+      if(NOIT_CHECK_KILLED(check)) nc_printf(ncct, "%skilled", idx++?",":"");
+      if(!NOIT_CHECK_CONFIGURED(check)) nc_printf(ncct, "%sunconfig", idx++?",":"");
+      if(NOIT_CHECK_DISABLED(check)) nc_printf(ncct, "%sdisabled", idx++?",":"");
+      nc_write(ncct, "\n", 1);
+      if(check->stats.current.status)
+        nc_printf(ncct, " recently: %s\n", check->stats.current.status);
+    }
-  }
- out:
@@ -582 +720 @@
-  xmlXPathContextPtr current_ctxt;
-  xmlNodePtr node = NULL;
-
-
+
+
+
-    nc_printf(ncct, "requires one argument\n");
-    return -1;
-  }
+  dest = argc ? argv[0] : (char *)closure;
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-argv[0]
-argv[0]
+dest
+dest
-  else {
-argv[0]
+dest
-  }
-  if(xpath[strlen(xpath)-1] == '/') xpath[strlen(xpath)-1] = '\0';
@@ -623 +763 @@
-    info->path = strdup((char *)xmlGetNodePath(node) + strlen("/noit"));
-  if(pobj) xmlXPathFreeObject(pobj);
+  if(closure) noit_console_state_pop(ncct, argc, argv, NULL, NULL);
-  return 0;
- bad:
@@ -703 +844 @@
-  /* _shorten string_ turning last { / @ * } to { / * } */
-  strlcpy(xpath + strlen(xpath) - 2, "*", 2);
-nc_printf(ncct, "Looking up path '%s'\n", xpath);
-  pobj = xmlXPathEval((xmlChar *)xpath, current_ctxt);
-  if(!pobj || pobj->type != XPATH_NODESET) {
@@ -761 +901 @@
-
-static char *
+conf_t_check_prompt(EditLine *el) {
+  noit_console_closure_t ncct;
+  noit_conf_t_userdata_t *info;
+  noit_check_t *check;
+  static char *tl = "noit(conf)# ";
+  static char *pfmt = "noit(conf:%s%s%s)# ";
+
+  el_get(el, EL_USERDATA, (void *)&ncct);
+  if(!ncct) return tl;
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  if(!info) return tl;
+
+  check = noit_poller_lookup(info->current_check);
+  if(check &&
+     check->target && check->target[0] &&
+     check->name && check->name[0])
+    snprintf(info->prompt, sizeof(info->prompt),
+             pfmt, check->target, "`", check->name);
+  else {
+    char uuid_str[37];
+    uuid_unparse_lower(info->current_check, uuid_str);
+    snprintf(info->prompt, sizeof(info->prompt), pfmt, "[", uuid_str, "]");
+  }
+  return info->prompt;
+}
+static char *
-conf_t_prompt(EditLine *el) {
-  noit_console_closure_t ncct;
@@ -865 +1031 @@
-  { "/checks", "timeout", "@timeout", 0 },
-  { "/checks", "oncheck", "@oncheck", 0 },
+  { "/checks", "disable", "@disable", 0 },
-  { "/checks", "module", "@module", 1 },
-};
@@ -896 +1063 @@
-             noit_conf_t_userdata_t *info, struct _valid_attr_t *attrinfo,
-             const char *value) {
-cnt, rv = -1
+i, cnt, rv = -1, active = 0
-  xmlXPathObjectPtr pobj = NULL;
-  xmlNodePtr node;
@@ -912 +1079 @@
-    snprintf(xpath, sizeof(xpath), "/noit/%s//check[@uuid]", path);
-    pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    if(pobj) xmlXPathFreeObject(pobj);
@@ -931 +1103 @@
-  if(attrinfo->checks_fixate &&
-     !strcmp((const char *)node->name, "check")) {
+    uuid_t checkid;
-    /* Detect if  we are actually a <check> node and attempting to
-     * change something we shouldn't.
-     * This is the counterpart noted above.
-     */
-
+
+
+
+
+
+
+
+
+
-    goto out;
-  }
@@ -945 +1126 @@
-  if(pobj) xmlXPathFreeObject(pobj);
-  return rv;
-}
-static void 
-refresh_subchecks(noit_console_closure_t ncct,
-                  noit_conf_t_userdata_t *info) {
-  char *path;
-  char xpath[1024];
- 
-  path = info->path;
-  if(!strcmp(path, "/")) path = "";
-
-  /* The first one is just a process_checks, the second is the reload.
-   * Reload does a lot of work and there is no need to do it twice.
-   */
-  snprintf(xpath, sizeof(xpath), "/noit/%s[@uuid]", path);
-  noit_poller_process_checks(xpath);
-  snprintf(xpath, sizeof(xpath), "/noit/%s//check[@uuid]", path);
-  noit_poller_reload(xpath);
-}
-int
@@ -1039 +1203 @@
-  cmd_info_t *showcmd;
-  noit_console_state_t *tl, *_conf_state, *_conf_t_state,
+                       *_conf_t_check_state,
-                       *_write_state, *_attr_state,
-                       *_unset_state, *_uattr_state;
@@ -1063 +1228 @@
-  ADD_CMD(_unset_state, "check", noit_console_config_nocheck, NULL, NULL);
- 
+  NEW_STATE(_conf_t_check_state);
+  _conf_t_check_state->console_prompt_function = conf_t_check_prompt;
+  DELEGATE_CMD(_conf_t_check_state, "attribute", _attr_state);
+  DELEGATE_CMD(_conf_t_check_state, "no", _unset_state);
+  ADD_CMD(_conf_t_check_state, "status", noit_console_show_check, NULL, NULL);
+  ADD_CMD(_conf_t_check_state, "exit", noit_console_config_cd, NULL, "..");
+
-  NEW_STATE(_conf_t_state); 
-  _conf_t_state->console_prompt_function = conf_t_prompt;
@@ -1068 +1240 @@
-  ADD_CMD(_conf_t_state, "ls", noit_console_config_show, NULL, NULL);
-  ADD_CMD(_conf_t_state, "cd", noit_console_config_cd, NULL, NULL);
-  ADD_CMD(_conf_t_state, "check", noit_console_check, NULL, NULL);
-  ADD_CMD(_conf_t_state, "section", noit_console_config_section, NULL, (void *)0);
+  ADD_CMD(_conf_t_state, "check", noit_console_check, _conf_t_check_state, NULL);
-
-  showcmd = noit_console_state_get_cmd(tl, "show");
-
+show_
-
-  DELEGATE_CMD(_conf_t_state, "write", _write_state);

src/noit_conf.h

@@ -17 +17 @@
-typedef struct {
-  char *path;
-
+
+
-} noit_conf_t_userdata_t;
-

src/sample.conf

@@ -39 +39 @@
-  </listeners>
-  <checks>
-
+module="ping_icmp" target="10.80.116.4" period="15000" timeout="14000"
-    <dc1 timeout="30000" period="60000">
-      <icmp module="ping_icmp" timeout="12000">