Changeset f207009593817c50a5fb4fd4e75cbdc4c79dcfcc

Timestamp:

08/15/11 19:36:52 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1313437012 -0400

git-parent:

[93c0f7d278d008139c3282dbbff1ed58c15d8dfa], [633221873749ec0a7b4c5550e3aed3c991ec5126]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1313436914 -0400

Message:

merge dtrace branch to master

Files:

• .gitignore (modified) (1 diff)
• src/jlog/jlog_io.c (modified) (1 diff)
• src/modules-lua/noit/module/jezebel.lua (modified) (1 diff)
• src/modules/collectd.c (modified) (2 diffs)
• src/modules/dns.c (modified) (2 diffs)
• src/modules/external.c (modified) (2 diffs)
• src/modules/httptrap.c (modified) (2 diffs)
• src/modules/lua.c (modified) (9 diffs)
• src/modules/lua_noit.h (modified) (1 diff)
• src/modules/mysql.c (modified) (2 diffs)
• src/modules/ping_icmp.c (modified) (2 diffs)
• src/modules/postgres.c (modified) (2 diffs)
• src/modules/postgres_ingestor.c (modified) (1 diff)
• src/modules/selfcheck.c (modified) (5 diffs)
• src/modules/snmp.c (modified) (2 diffs)
• src/modules/ssh2.c (modified) (2 diffs)
• src/modules/test_abort.c (modified) (2 diffs)
• src/noit_check.c (modified) (5 diffs)
• src/noit_check_tools.c (modified) (5 diffs)
• src/noit_check_tools.h (modified) (3 diffs)
• src/noit_conf_checks.c (modified) (3 diffs)
• src/noit_jlog_listener.c (modified) (6 diffs)
• src/noit_jlog_listener.h (modified) (2 diffs)
• src/utils/noit_log.c (modified) (4 diffs)

.gitignore

@@ -12 +12 @@
-Makefile
-sql/reconnoiter_ddl_dump.sql
+src/*.dSYM
-src/lua/src/lua
+src/modules/*.dSYM
-src/noit_version.h
-src/noitd

src/jlog/jlog_io.c

@@ -236 +236 @@
-{
-  struct stat sb;
-
-
+
+
+
-  return sb.st_size;
-}

src/modules-lua/noit/module/jezebel.lua

@@ -161 +161 @@
-    local doc = noit.parsexml(output)
-    if doc == nil then
-error
+debug
-        check.status("bad xml from jezebel")
-        return

src/modules/collectd.c

@@ -1300 +1300 @@
-}
-
-
+
+
-  collectd_closure_t *ccl;
-  struct timeval duration;
@@ -1471 +1472 @@
-   * Then we can warn people if no stats where written in a period of time
-   */
-
+, cause
-  return 0;
-}

src/modules/dns.c

@@ -596 +596 @@
-}
-
-
+
+
-  void *vnv_pair = NULL;
-  struct dns_nameval *nv_pair;
@@ -758 +759 @@
-  ci->check = check;
-  ci->self = self;
-
+, cause
-  return 0;
-}

src/modules/external.c

@@ -443 +443 @@
-  return 0;
-}
-
+
+
-  struct timeval when, p_int;
-  external_closure_t *ecl;
@@ -593 +594 @@
-                                    int once, noit_check_t *cause) {
-  if(!check->closure) check->closure = calloc(1, sizeof(struct check_info));
-
+, cause
-  return 0;
-}

src/modules/httptrap.c

@@ -146 +146 @@
-}
-
-
+
+
-  httptrap_closure_t *ccl;
-  struct timeval duration;
@@ -382 +383 @@
-    ccl->self = self;
-  }
-
+, cause
-  return 0;
-}

src/modules/lua.c

@@ -249 +249 @@
-}
-static int
+noit_lua_get_available(lua_State *L) {
+  char av[2] = { '\0', '\0' };
+  noit_check_t *check;
+  noit_lua_check_info_t *ci;
+  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
+  check = lua_touserdata(L, lua_upvalueindex(1));
+  av[0] = (char)check->stats.current.available;
+  lua_pushstring(L, av);
+  return 1;
+}
+static int
-noit_lua_set_available(lua_State *L) {
-  noit_check_t *check;
@@ -257 +268 @@
-  ci->current.available = lua_tointeger(L, lua_upvalueindex(2));
-  return 0;
+}
+static int
+noit_lua_get_state(lua_State *L) {
+  char status[2] = { '\0', '\0' };
+  noit_check_t *check;
+  noit_lua_check_info_t *ci;
+  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
+  check = lua_touserdata(L, lua_upvalueindex(1));
+  status[0] = (char)check->stats.current.state;
+  lua_pushstring(L, status);
+  return 1;
-}
-static int
@@ -373 +395 @@
-        lua_pushcclosure(L, noit_lua_set_available, 2);
-      }
+      else if(!strcmp(k, "availability")) {
+        lua_pushlightuserdata(L, check);
+        lua_pushcclosure(L, noit_lua_get_available, 1);
+      }
-      else break;
-      return 1;
@@ -423 +449 @@
-      return 1;
-    case 's':
-
+
+
+
+
+
-        lua_pushlightuserdata(L, check);
-        lua_pushcclosure(L, noit_lua_set_status, 1);
@@ -612 +642 @@
-  ci->current.duration = duration.tv_sec * 1000 + duration.tv_usec / 1000;
-
-
+
+
+
+
-  free(ci->current.status);
-}
@@ -705 +738 @@
-}
-static int
-
+
+
-  LMC_DECL(L, self);
-  struct nl_intcl *int_cl;
@@ -721 +755 @@
-  ci->self = self;
-  ci->check = check;
+  ci->cause = cause;
-  noit_check_stats_clear(&ci->current);
-
@@ -753 +788 @@
-  noit_lua_setup_module(ci->coro_state, ci->self);
-  noit_lua_setup_check(ci->coro_state, ci->check);
-
+
+
+
-
-  return 0;
@@ -768 +805 @@
-                               int once, noit_check_t *cause) {
-  if(!check->closure) check->closure = calloc(1, sizeof(noit_lua_check_info_t));
-
+, cause
-  return 0;
-}

src/modules/lua_noit.h

@@ -57 +57 @@
-  noit_module_t *self;
-  noit_check_t *check;
+  noit_check_t *cause;
-  int timed_out;
-  eventer_t timeout_event;

src/modules/mysql.c

@@ -354 +354 @@
-}
-
-
+
+
-  mysql_check_info_t *ci = check->closure;
-  struct timeval __now;
@@ -377 +378 @@
-
-static int mysql_initiate_check(noit_module_t *self, noit_check_t *check,
-parent
+cause
-  if(!check->closure) check->closure = calloc(1, sizeof(mysql_check_info_t));
-
+, cause
-  return 0;
-}

src/modules/ping_icmp.c

@@ -500 +500 @@
-  }
-}
-
+
+
-  struct timeval when, p_int;
-  struct ping_payload *payload;
@@ -626 +627 @@
-                                    int once, noit_check_t *cause) {
-  if(!check->closure) check->closure = calloc(1, sizeof(struct check_info));
-
+, cause
-  return 0;
-}

src/modules/postgres.c

@@ -287 +287 @@
-}
-
-
+
+
-  postgres_check_info_t *ci = check->closure;
-  struct timeval __now;
@@ -310 +311 @@
-
-static int postgres_initiate_check(noit_module_t *self, noit_check_t *check,
-parent
+cause
-  if(!check->closure) check->closure = calloc(1, sizeof(postgres_check_info_t));
-
+, cause
-  return 0;
-}

src/modules/postgres_ingestor.c

@@ -1460 +1460 @@
-  size = pathconf(path, _PC_NAME_MAX);
-#endif
-IN
+AX
-  de = alloca(size);
-  root = opendir(path);

src/modules/selfcheck.c

@@ -43 +43 @@
-#include "noit_check.h"
-#include "noit_check_tools.h"
+#include "noit_jlog_listener.h"
-#include "utils/noit_log.h"
-#include "utils/noit_hash.h"
@@ -72 +73 @@
-  snprintf(buffer, sizeof(buffer), "%s_threads", jobq->queue_name);
-  noit_stats_set_metric(current, buffer, METRIC_INT32, &s32);
+}
+static int selfcheck_feed_details(jlog_feed_stats_t *s, void *vcurrent) {
+  char buff[256];
+  uint64_t ms;
+  struct timeval now, diff;
+  stats_t *current = (stats_t *)vcurrent;
+  gettimeofday(&now, NULL);
+
+  if(s->last_connection.tv_sec > 0) {
+    sub_timeval(now, s->last_connection, &diff);
+    ms = diff.tv_sec * 1000 + diff.tv_usec / 1000;
+    snprintf(buff, sizeof(buff), "feed`%s`last_connection_ms", s->feed_name);
+    noit_stats_set_metric(current, buff, METRIC_UINT64, &ms);
+  }
+
+  if(s->last_checkpoint.tv_sec > 0) {
+    sub_timeval(now, s->last_checkpoint, &diff);
+    ms = diff.tv_sec * 1000 + diff.tv_usec / 1000;
+    snprintf(buff, sizeof(buff), "feed`%s`last_checkpoint_ms", s->feed_name);
+    noit_stats_set_metric(current, buff, METRIC_UINT64, &ms);
+  }
+  return 1;
-}
-static void selfcheck_log_results(noit_module_t *self, noit_check_t *check) {
@@ -113 +136 @@
-  u64 = noit_check_completion_count();
-  noit_stats_set_metric(&current, "checks_run", METRIC_UINT64, &u64);
+  /* feed pull info */
+  noit_jlog_foreach_feed_stats(selfcheck_feed_details, &current);
-
-  noit_check_set_stats(self, check, &current);
@@ -161 +186 @@
-}
-
-
+
+
-  selfcheck_info_t *ci = check->closure;
-  struct timeval __now;
@@ -183 +209 @@
-
-static int selfcheck_initiate_check(noit_module_t *self, noit_check_t *check,
-parent
+cause
-  if(!check->closure) check->closure = calloc(1, sizeof(selfcheck_info_t));
-
+, cause
-  return 0;
-}

src/modules/snmp.c

@@ -876 +876 @@
-  return info->noids;
-}
-
+
+
-  struct snmp_pdu *req;
-  struct target_session *ts;
@@ -958 +959 @@
-                                    int once, noit_check_t *cause) {
-  if(!check->closure) check->closure = calloc(1, sizeof(struct check_info));
-
+, cause
-  return 0;
-}

src/modules/ssh2.c

@@ -277 +277 @@
-  return 0;
-}
-
+
+
-  ssh2_check_info_t *ci = check->closure;
-  struct timeval p_int, __now;
@@ -385 +386 @@
-
-static int ssh2_initiate_check(noit_module_t *self, noit_check_t *check,
-parent
+cause
-  if(!check->closure) check->closure = calloc(1, sizeof(ssh2_check_info_t));
-
+, cause
-  return 0;
-}

src/modules/test_abort.c

@@ -152 +152 @@
-}
-
-
+
+
-  test_abort_check_info_t *ci = check->closure;
-  struct timeval __now;
@@ -188 +189 @@
-
-static int test_abort_initiate_check(noit_module_t *self, noit_check_t *check,
-parent
+cause
-  if(!check->closure) check->closure = calloc(1, sizeof(test_abort_check_info_t));
-
+, cause
-  return 0;
-}

src/noit_check.c

@@ -122 +122 @@
-  if(start_offset_ms == -1)
-    start_offset_ms = drand48() * noit_check_max_initial_stutter();
-
+ && check->period
-    max = noit_check_max_initial_stutter();
-    offset = start_offset_ms + drand48() * 1000;
@@ -337 +337 @@
-    if(check->oncheck) {
-      /* This service is causally triggered by another service */
+      uuid_t id;
-      char fullcheck[1024];
-      char *name = check->oncheck;
@@ -342 +343 @@
-
-      noitL(noit_debug, "Searching for upstream trigger on %s\n", name);
+      parent = NULL;
+      if(uuid_parse(check->oncheck, id) == 0) {
+        target = "";
+        parent = noit_poller_lookup(id);
+      }
-      if((target = strchr(check->oncheck, '`')) != NULL) {
-
++ 1 
-        name = target + 1;
-        target = fullcheck;
+        parent = noit_poller_lookup_by_name(target, name);
-      }
-
-
-
-
+
+
+
+
+
-      if(!parent) {
-        check->flags |= NP_DISABLED;
@@ -862 +870 @@
-}
-
+static int
+bad_check_initiate(noit_module_t *self, noit_check_t *check,
+                   int once, noit_check_t *cause) {
+  /* self is likely null here -- why it is bad, in fact */
+  /* this is only suitable to call in one-offs */
+  stats_t current;
+  char buff[256];
+  if(!once) return -1;
+  if(!check) return -1;
+  assert(!(check->flags & NP_RUNNING));
+  check->flags |= NP_RUNNING;
+  noit_check_stats_clear(&current);
+  gettimeofday(&current.whence, NULL);
+  current.duration = 0;
+  current.available = NP_UNKNOWN;
+  current.state = NP_UNKNOWN;
+  snprintf(buff, sizeof(buff), "check[%s] implementation offline",
+           check->module);
+  current.status = buff;
+  noit_check_set_stats(self, check, &current);
+  check->flags &= ~NP_RUNNING;
+  return 0;
+}
-void
-noit_check_stats_clear(stats_t *s) {
@@ -1144 +1175 @@
-    noit_module_t *mod;
-    mod = noit_module_lookup(dep->check->module);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

src/noit_check_tools.c

@@ -42 +42 @@
-  noit_module_t *self;
-  noit_check_t *check;
+  noit_check_t *cause;
-  dispatch_func_t dispatch;
-} recur_closure_t;
@@ -52 +53 @@
-  noit_check_resolve(rcl->check);
-  noit_check_schedule_next(rcl->self, &e->whence, rcl->check, now,
-
+, NULL
-  if(NOIT_CHECK_RESOLVED(rcl->check)) {
-    if(NOIT_CHECK_DISPATCH_ENABLED()) {
@@ -60 +61 @@
-                          rcl->check->target);
-    }
-
+, rcl->cause
-  }
-  else
@@ -72 +73 @@
-noit_check_schedule_next(noit_module_t *self,
-                         struct timeval *last_check, noit_check_t *check,
-
+
+
-  eventer_t newe;
-  struct timeval period, earliest;
-  recur_closure_t *rcl;
-
+  assert(cause == NULL);
-  assert(check->fire_event == NULL);
-  if(check->period == 0) return 0;
@@ -112 +115 @@
-  rcl->self = self;
-  rcl->check = check;
+  rcl->cause = cause;
-  rcl->dispatch = dispatch;
-  newe->closure = rcl;

src/noit_check_tools.h

@@ -41 +41 @@
-#include "noit_check_tools_shared.h"
-
-
+
+
-
-API_EXPORT(void)
@@ -49 +50 @@
-  noit_check_schedule_next(noit_module_t *self,
-                           struct timeval *last_check, noit_check_t *check,
-
+
+
-
-API_EXPORT(void)
@@ -57 +59 @@
-  noit_check_run_full_asynch(noit_check_t *check, eventer_func_t callback);
-
-
+, cause
-  if(once) { \
-
+, cause
-  } \
-  else if(!check->fire_event) { \
-    struct timeval epoch = { 0L, 0L }; \
-    noit_check_fake_last_check(check, &epoch, NULL); \
-
+, cause
-  } \
-} while(0)

src/noit_conf_checks.c

@@ -384 +384 @@
-}
-static int
+_qsort_string_compare(const void *i1, const void *i2) {
+        const char *s1 = ((const char **)i1)[0];
+        const char *s2 = ((const char **)i2)[0];
+        return strcasecmp(s1, s2);
+}
+static int
-noit_console_show_check(noit_console_closure_t ncct,
-                        int argc, char **argv,
@@ -488 +494 @@
-      else {
-        stats_t *c = &check->stats.current;
+        int mcount=0;
+        const char **sorted_keys;
+        char buff[256];
-        struct timeval now, diff;
+        noit_boolean filtered;
+
-        gettimeofday(&now, NULL);
-        sub_timeval(now, c->whence, &diff);
@@ -499 +510 @@
-        nc_printf(ncct, " metrics:\n");
-        memset(&iter, 0, sizeof(iter));
+        sorted_keys = alloca(c->metrics.size * sizeof(*sorted_keys));
-        while(noit_hash_next(&c->metrics, &iter, &k, &klen, &data)) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      }

src/noit_jlog_listener.c

@@ -65 +65 @@
-  jlog_id start;
-  jlog_id finish;
+  jlog_feed_stats_t *feed_stats;
-  int count;
-  int wants_shutdown;
@@ -89 +90 @@
-}
-
+static noit_hash_table feed_stats = NOIT_HASH_EMPTY;
+
+jlog_feed_stats_t *
+noit_jlog_feed_stats(const char *sub) {
+  void *vs = NULL;
+  jlog_feed_stats_t *s = NULL;
+  if(noit_hash_retrieve(&feed_stats, sub, strlen(sub), &vs))
+    return (jlog_feed_stats_t *)vs;
+  s = calloc(1, sizeof(*s));
+  s->feed_name = strdup(sub);
+  noit_hash_store(&feed_stats, s->feed_name, strlen(s->feed_name), s);
+  return s;
+}
+int
+noit_jlog_foreach_feed_stats(int (*f)(jlog_feed_stats_t *, void *),
+                             void *c) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  const char *key;
+  int klen, cnt = 0;
+  void *vs;
+  while(noit_hash_next(&feed_stats, &iter, &key, &klen, &vs)) {
+    cnt += f((jlog_feed_stats_t *)vs, c);
+  }
+  return cnt;
+}
-static int
-__safe_Ewrite(eventer_t e, void *b, int l, int *mask) {
@@ -214 +240 @@
-        goto alldone;
-      }
+      gettimeofday(&jcl->feed_stats->last_checkpoint, NULL);
-      jlog_ctx_read_checkpoint(jcl->jlog, &jcl->chkpt);
-    }
@@ -242 +269 @@
- alldone:
-  e->opset->close(e->fd, &mask, e);
+  noit_atomic_dec32(&jcl->feed_stats->connections);
-  if(jcl) noit_jlog_closure_free(jcl);
-  if(ac) acceptor_closure_free(ac);
@@ -310 +338 @@
-      }
-      strlcpy(subscriber, ac->remote_cn, sizeof(subscriber));
+      jcl->feed_stats = noit_jlog_feed_stats(subscriber);
-    }
-    else {
+      jcl->feed_stats = noit_jlog_feed_stats("~");
-      snprintf(subscriber, sizeof(subscriber),
-               "~%07d", noit_atomic_inc32(&tmpfeedcounter));
@@ -354 +384 @@
-  pthread_attr_init(&tattr);
-  pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
+  gettimeofday(&jcl->feed_stats->last_connection, NULL);
+  noit_atomic_inc32(&jcl->feed_stats->connections);
-  if(pthread_create(&tid, &tattr, noit_jlog_thread_main, newe) == 0) {
-    return 0;

src/noit_jlog_listener.h

@@ -40 +40 @@
-#define NOIT_JLOG_DATA_TEMP_FEED 0x7e66feed
-
+typedef struct {
+  char *feed_name;
+  noit_atomic32_t connections;
+  struct timeval last_connection;
+  struct timeval last_checkpoint;
+} jlog_feed_stats_t;
+
-API_EXPORT(void)
-  noit_jlog_listener_init(void);
@@ -47 +54 @@
-                    struct timeval *now);
-
+/* This API call is only safe from the eventer thread */
+API_EXPORT(jlog_feed_stats_t *)
+  noit_jlog_feed_stats(const char *sub);
+
+API_EXPORT(int)
+  noit_jlog_foreach_feed_stats(int (*f)(jlog_feed_stats_t *, void *),
+                               void *);
+
-#endif

src/utils/noit_log.c

@@ -436 +436 @@
-  return 0;
-}
+static void
+noit_log_jlog_err(void *ctx, const char *format, ...) {
+  int rv;
+  struct timeval now;
+  va_list arg;
+  va_start(arg, format);
+  gettimeofday(&now, NULL);
+  rv = noit_vlog(noit_error, &now, "jlog.c", 0, format, arg);
+  va_end(arg);
+}
-static int
-jlog_logio_open(noit_log_stream_t ls) {
@@ -447 +457 @@
-  log = jlog_new(path);
-  if(!log) return -1;
+  jlog_set_error_func(log, noit_log_jlog_err, ls);
-  /* Open the writer. */
-  if(jlog_ctx_open_writer(log)) {
@@ -454 +465 @@
-    jlog_ctx_close(log);
-    log = jlog_new(path);
+    jlog_set_error_func(log, noit_log_jlog_err, ls);
-    if(jlog_ctx_init(log)) {
-      noitL(noit_error, "Cannot init jlog writer: %s\n",
@@ -463 +475 @@
-    jlog_ctx_close(log);
-    log = jlog_new(path);
+    jlog_set_error_func(log, noit_log_jlog_err, ls);
-    if(jlog_ctx_open_writer(log)) {
-      noitL(noit_error, "Cannot open jlog writer: %s\n",