Changeset 1e78a691ff7c7b4c7098d2c3869dccd0fbdc7248

Timestamp:

11/23/11 00:00:34 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1322006434 -0500

git-parent:

[e8182656cf6fe72dd52cf42f5e1e7b34c8f6e10a]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1322006434 -0500

Message:

fixups... and heartbeat during the initalization of the postgres stuff as it can take a while on large systems

Files:

• src/modules/handoff_ingestor.c (modified) (1 diff)
• src/modules/postgres_ingestor.c (modified) (5 diffs)

src/modules/handoff_ingestor.c

@@ -191 +191 @@
-    strlcpy(hfile, path, sizeof(hfile));
-
-error
+debug
-  if(the_one_and_only) {
-    noit_http_session_ctx *ctx = the_one_and_only;

src/modules/postgres_ingestor.c

@@ -39 +39 @@
-#include "utils/noit_mkdir.h"
-#include "utils/noit_getip.h"
+#include "utils/noit_watchdog.h"
-#include "stratcon_datastore.h"
-#include "stratcon_realtime_http.h"
@@ -1448 +1449 @@
-  ij->cpool = get_conn_pool_for_remote(ij->remote_str, ij->remote_cn,
-                                       ij->fqdn);
-error
+debug
-  ingest = eventer_alloc();
-  ingest->mask = EVENTER_ASYNCH;
@@ -1496 +1497 @@
-            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : "");
-    }
+    noit_watchdog_child_heartbeat();
-  }
-  PQclear(d->res);
@@ -1559 +1561 @@
-            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : "");
-    }
+    noit_watchdog_child_heartbeat();
-  }
-  PQclear(d->res);
@@ -1634 +1637 @@
-}
-static int is_postgres_ingestor_file(const char *file) {
+  noit_watchdog_child_heartbeat();
-  return (strlen(file) == 19 && !strcmp(file + 16, ".pg"));
-}
-static int postgres_ingestor_init(noit_module_generic_t *self) {
+  stratcon_datastore_core_init();
-  pthread_mutex_init(&ds_conns_lock, NULL);
-  pthread_mutex_init(&storagenode_to_info_cache_lock, NULL);