Changeset 811c412ce800f3a4eeaa9c2bc4d5c35fe9982384

Timestamp:

08/12/11 04:47:29 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[7b999849cdf5ce592e0b1813f5f4800b1854fecd]

git-author:

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

Message:

selfcheck introspection on when data is pulled by stratcon

Files:

• src/modules/selfcheck.c (modified) (3 diffs)
• src/noit_jlog_listener.c (modified) (6 diffs)
• src/noit_jlog_listener.h (modified) (2 diffs)

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);

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