Changeset 1e78a691ff7c7b4c7098d2c3869dccd0fbdc7248

Show
Ignore:
Timestamp:
11/23/11 00:00:34 (3 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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/modules/handoff_ingestor.c

    r7e10f7c r1e78a69  
    191191    strlcpy(hfile, path, sizeof(hfile)); 
    192192 
    193   noitL(noit_error, " handoff -> %s\n", hfile); 
     193  noitL(noit_debug, " handoff -> %s\n", hfile); 
    194194  if(the_one_and_only) { 
    195195    noit_http_session_ctx *ctx = the_one_and_only; 
  • src/modules/postgres_ingestor.c

    r7e10f7c r1e78a69  
    3939#include "utils/noit_mkdir.h" 
    4040#include "utils/noit_getip.h" 
     41#include "utils/noit_watchdog.h" 
    4142#include "stratcon_datastore.h" 
    4243#include "stratcon_realtime_http.h" 
     
    14481449  ij->cpool = get_conn_pool_for_remote(ij->remote_str, ij->remote_cn, 
    14491450                                       ij->fqdn); 
    1450   noitL(noit_error, "ingesting payload: %s\n", ij->filename); 
     1451  noitL(noit_debug, "ingesting payload: %s\n", ij->filename); 
    14511452  ingest = eventer_alloc(); 
    14521453  ingest->mask = EVENTER_ASYNCH; 
     
    14961497            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : ""); 
    14971498    } 
     1499    noit_watchdog_child_heartbeat(); 
    14981500  } 
    14991501  PQclear(d->res); 
     
    15591561            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : ""); 
    15601562    } 
     1563    noit_watchdog_child_heartbeat(); 
    15611564  } 
    15621565  PQclear(d->res); 
     
    16341637} 
    16351638static int is_postgres_ingestor_file(const char *file) { 
     1639  noit_watchdog_child_heartbeat(); 
    16361640  return (strlen(file) == 19 && !strcmp(file + 16, ".pg")); 
    16371641} 
    16381642static int postgres_ingestor_init(noit_module_generic_t *self) { 
     1643  stratcon_datastore_core_init(); 
    16391644  pthread_mutex_init(&ds_conns_lock, NULL); 
    16401645  pthread_mutex_init(&storagenode_to_info_cache_lock, NULL);