X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Frrdhost.c;h=81ff96f892415a82a80f6a2ff2f330203a8e9caa;hb=8679670bdbe3c5928ec2e266d9c72e1a758fdf37;hp=7002c4823472c7d85c97a3e65b7bfad0796e8333;hpb=73212e3a8731012fee476e373f4a5b647f5126e5;p=netdata.git diff --git a/src/rrdhost.c b/src/rrdhost.c index 7002c482..81ff96f8 100644 --- a/src/rrdhost.c +++ b/src/rrdhost.c @@ -3,7 +3,7 @@ RRDHOST *localhost = NULL; size_t rrd_hosts_available = 0; -pthread_rwlock_t rrd_rwlock = PTHREAD_RWLOCK_INITIALIZER; +netdata_rwlock_t rrd_rwlock = NETDATA_RWLOCK_INITIALIZER; time_t rrdset_free_obsolete_time = 3600; time_t rrdhost_free_orphan_time = 3600; @@ -83,7 +83,7 @@ RRDHOST *rrdhost_create(const char *hostname, const char *guid, const char *os, int update_every, - int entries, + long entries, RRD_MEMORY_MODE memory_mode, int health_enabled, int rrdpush_enabled, @@ -91,13 +91,14 @@ RRDHOST *rrdhost_create(const char *hostname, char *rrdpush_api_key, int is_localhost ) { - debug(D_RRDHOST, "Host '%s': adding with guid '%s'", hostname, guid); + rrd_check_wrlock(); + RRDHOST *host = callocz(1, sizeof(RRDHOST)); host->rrd_update_every = update_every; - host->rrd_history_entries = entries; + host->rrd_history_entries = align_entries_to_pagesize(memory_mode, entries); host->rrd_memory_mode = memory_mode; host->health_enabled = (memory_mode == RRD_MEMORY_MODE_NONE)? 0 : health_enabled; host->rrdpush_enabled = (rrdpush_enabled && rrdpush_destination && *rrdpush_destination && rrdpush_api_key && *rrdpush_api_key); @@ -108,8 +109,8 @@ RRDHOST *rrdhost_create(const char *hostname, host->rrdpush_pipe[1] = -1; host->rrdpush_socket = -1; - pthread_mutex_init(&host->rrdpush_mutex, NULL); - pthread_rwlock_init(&host->rrdhost_rwlock, NULL); + netdata_mutex_init(&host->rrdpush_mutex); + netdata_rwlock_init(&host->rrdhost_rwlock); rrdhost_init_hostname(host, hostname); rrdhost_init_machine_guid(host, guid); @@ -120,6 +121,13 @@ RRDHOST *rrdhost_create(const char *hostname, avl_init_lock(&(host->rrdfamily_root_index), rrdfamily_compare); avl_init_lock(&(host->variables_root_index), rrdvar_compare); + if(config_get_boolean(CONFIG_SECTION_GLOBAL, "delete obsolete charts files", 1)) + rrdhost_flag_set(host, RRDHOST_DELETE_OBSOLETE_FILES); + + if(config_get_boolean(CONFIG_SECTION_GLOBAL, "delete orphan hosts files", 1) && !is_localhost) + rrdhost_flag_set(host, RRDHOST_DELETE_ORPHAN_FILES); + + // ------------------------------------------------------------------------ // initialize health variables @@ -137,7 +145,7 @@ RRDHOST *rrdhost_create(const char *hostname, else host->health_log.max = (unsigned int)n; - pthread_rwlock_init(&(host->health_log.alarm_log_rwlock), NULL); + netdata_rwlock_init(&host->health_log.alarm_log_rwlock); char filename[FILENAME_MAX + 1]; @@ -201,8 +209,6 @@ RRDHOST *rrdhost_create(const char *hostname, // ------------------------------------------------------------------------ // link it and add it to the index - rrd_wrlock(); - if(is_localhost) { host->next = localhost; localhost = host; @@ -227,7 +233,7 @@ RRDHOST *rrdhost_create(const char *hostname, ", os %s" ", update every %d" ", memory mode %s" - ", history entries %d" + ", history entries %ld" ", streaming %s" " (to '%s' with api key '%s')" ", health %s" @@ -255,7 +261,6 @@ RRDHOST *rrdhost_create(const char *hostname, } rrd_hosts_available++; - rrd_unlock(); return host; } @@ -265,7 +270,7 @@ RRDHOST *rrdhost_find_or_create( , const char *guid , const char *os , int update_every - , int history + , long history , RRD_MEMORY_MODE mode , int health_enabled , int rrdpush_enabled @@ -274,6 +279,7 @@ RRDHOST *rrdhost_find_or_create( ) { debug(D_RRDHOST, "Searching for host '%s' with guid '%s'", hostname, guid); + rrd_wrlock(); RRDHOST *host = rrdhost_find_by_guid(guid, 0); if(!host) { host = rrdhost_create( @@ -295,8 +301,8 @@ RRDHOST *rrdhost_find_or_create( if(strcmp(host->hostname, hostname)) { char *t = host->hostname; - char *n = strdupz(hostname); - host->hostname = n; + host->hostname = strdupz(hostname); + host->hash_hostname = simple_hash(host->hostname); freez(t); } @@ -304,33 +310,47 @@ RRDHOST *rrdhost_find_or_create( error("Host '%s' has an update frequency of %d seconds, but the wanted one is %d seconds.", host->hostname, host->rrd_update_every, update_every); if(host->rrd_history_entries != history) - error("Host '%s' has history of %d entries, but the wanted one is %d entries.", host->hostname, host->rrd_history_entries, history); + error("Host '%s' has history of %ld entries, but the wanted one is %ld entries.", host->hostname, host->rrd_history_entries, history); if(host->rrd_memory_mode != mode) error("Host '%s' has memory mode '%s', but the wanted one is '%s'.", host->hostname, rrd_memory_mode_name(host->rrd_memory_mode), rrd_memory_mode_name(mode)); } + rrd_unlock(); - rrdhost_cleanup_remote_stale(host); + rrdhost_cleanup_orphan(host); return host; } -void rrdhost_cleanup_remote_stale(RRDHOST *protected) { +static inline int rrdhost_should_be_deleted(RRDHOST *host, RRDHOST *protected, time_t now) { + if(host != protected + && host != localhost + && !host->connected_senders + && host->senders_disconnected_time + && host->senders_disconnected_time + rrdhost_free_orphan_time < now) + return 1; + + return 0; +} + +void rrdhost_cleanup_orphan(RRDHOST *protected) { time_t now = now_realtime_sec(); rrd_wrlock(); - RRDHOST *h; + RRDHOST *host; restart_after_removal: - rrdhost_foreach_write(h) { - if(h != protected - && h != localhost - && !h->connected_senders - && h->senders_disconnected_time + rrdhost_free_orphan_time < now) { - info("Host '%s' with machine guid '%s' is obsolete - cleaning up.", h->hostname, h->machine_guid); - rrdhost_save(h); - rrdhost_free(h); + rrdhost_foreach_write(host) { + if(rrdhost_should_be_deleted(host, protected, now)) { + info("Host '%s' with machine guid '%s' is obsolete - cleaning up.", host->hostname, host->machine_guid); + + if(rrdset_flag_check(host, RRDHOST_ORPHAN)) + rrdhost_delete(host); + else + rrdhost_save(host); + + rrdhost_free(host); goto restart_after_removal; } } @@ -349,6 +369,7 @@ void rrd_init(char *hostname) { rrdpush_init(); debug(D_RRDHOST, "Initializing localhost with hostname '%s'", hostname); + rrd_wrlock(); localhost = rrdhost_create( hostname , registry_get_this_machine_guid() @@ -362,40 +383,41 @@ void rrd_init(char *hostname) { , default_rrdpush_api_key , 1 ); + rrd_unlock(); } // ---------------------------------------------------------------------------- // RRDHOST - lock validations // there are only used when NETDATA_INTERNAL_CHECKS is set -void rrdhost_check_rdlock_int(RRDHOST *host, const char *file, const char *function, const unsigned long line) { +void __rrdhost_check_rdlock(RRDHOST *host, const char *file, const char *function, const unsigned long line) { debug(D_RRDHOST, "Checking read lock on host '%s'", host->hostname); - int ret = pthread_rwlock_trywrlock(&host->rrdhost_rwlock); + int ret = netdata_rwlock_trywrlock(&host->rrdhost_rwlock); if(ret == 0) fatal("RRDHOST '%s' should be read-locked, but it is not, at function %s() at line %lu of file '%s'", host->hostname, function, line, file); } -void rrdhost_check_wrlock_int(RRDHOST *host, const char *file, const char *function, const unsigned long line) { +void __rrdhost_check_wrlock(RRDHOST *host, const char *file, const char *function, const unsigned long line) { debug(D_RRDHOST, "Checking write lock on host '%s'", host->hostname); - int ret = pthread_rwlock_tryrdlock(&host->rrdhost_rwlock); + int ret = netdata_rwlock_tryrdlock(&host->rrdhost_rwlock); if(ret == 0) fatal("RRDHOST '%s' should be write-locked, but it is not, at function %s() at line %lu of file '%s'", host->hostname, function, line, file); } -void rrd_check_rdlock_int(const char *file, const char *function, const unsigned long line) { +void __rrd_check_rdlock(const char *file, const char *function, const unsigned long line) { debug(D_RRDHOST, "Checking read lock on all RRDs"); - int ret = pthread_rwlock_trywrlock(&rrd_rwlock); + int ret = netdata_rwlock_trywrlock(&rrd_rwlock); if(ret == 0) fatal("RRDs should be read-locked, but it are not, at function %s() at line %lu of file '%s'", function, line, file); } -void rrd_check_wrlock_int(const char *file, const char *function, const unsigned long line) { +void __rrd_check_wrlock(const char *file, const char *function, const unsigned long line) { debug(D_RRDHOST, "Checking write lock on all RRDs"); - int ret = pthread_rwlock_tryrdlock(&rrd_rwlock); + int ret = netdata_rwlock_tryrdlock(&rrd_rwlock); if(ret == 0) fatal("RRDs should be write-locked, but it are not, at function %s() at line %lu of file '%s'", function, line, file); } @@ -409,6 +431,10 @@ void rrdhost_free(RRDHOST *host) { info("Freeing all memory for host '%s'...", host->hostname); rrd_check_wrlock(); // make sure the RRDs are write locked + + // stop a possibly running thread + rrdpush_sender_thread_stop(host); + rrdhost_wrlock(host); // lock this RRDHOST // ------------------------------------------------------------------------ @@ -447,8 +473,6 @@ void rrdhost_free(RRDHOST *host) { // ------------------------------------------------------------------------ // free it - rrdpush_sender_thread_stop(host); - freez(host->os); freez(host->cache_dir); freez(host->varlib_dir); @@ -459,6 +483,8 @@ void rrdhost_free(RRDHOST *host) { freez(host->health_log_filename); freez(host->hostname); rrdhost_unlock(host); + netdata_rwlock_destroy(&host->health_log.alarm_log_rwlock); + netdata_rwlock_destroy(&host->rrdhost_rwlock); freez(host); rrd_hosts_available--; @@ -493,6 +519,29 @@ void rrdhost_save(RRDHOST *host) { rrdhost_unlock(host); } +// ---------------------------------------------------------------------------- +// RRDHOST - delete files + +void rrdhost_delete(RRDHOST *host) { + if(!host) return; + + info("Deleting database of host '%s'...", host->hostname); + + RRDSET *st; + + // we get a write lock + // to ensure only one thread is saving the database + rrdhost_wrlock(host); + + rrdset_foreach_write(st, host) { + rrdset_rdlock(st); + rrdset_delete(st); + rrdset_unlock(st); + } + + rrdhost_unlock(host); +} + void rrdhost_save_all(void) { info("Saving database [%zu hosts(s)]...", rrd_hosts_available); @@ -505,7 +554,7 @@ void rrdhost_save_all(void) { rrd_unlock(); } -void rrdhost_cleanup(RRDHOST *host) { +void rrdhost_cleanup_obsolete(RRDHOST *host) { time_t now = now_realtime_sec(); RRDSET *st; @@ -519,7 +568,12 @@ restart_after_removal: )) { rrdset_rdlock(st); - rrdset_save(st); + + if(rrdhost_flag_check(host, RRDHOST_DELETE_OBSOLETE_FILES)) + rrdset_delete(st); + else + rrdset_save(st); + rrdset_unlock(st); rrdset_free(st);