Changeset 3c6e7b2c6c3b65676bb51326a13b12d505806bce

Timestamp:

02/12/10 16:12:02 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1265991122 +0000

git-parent:

[d50e0629228ff7ed2cbc8b9e7f375dabc526956e]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1265991122 +0000

Message:

cache noits by cn if specified and use that as a short-circuit, refs #255

Files:

• src/stratcon_datastore.c (modified) (3 diffs)
• src/stratcon_jlog_streamer.c (modified) (5 diffs)
• src/stratcon_jlog_streamer.h (modified) (1 diff)

src/stratcon_datastore.c

@@ -605 +605 @@
-    char uuid_str[UUID_STR_LEN+1];
-    const char *fqdn, *dsn, *remote_cn;
+    char remote_ip[32];
-    int storagenode_id;
-
@@ -612 +613 @@
-      continue;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    cq = get_conn_q_for_remote(NULL, remote_cn, fqdn, dsn);
-    stratcon_database_connect(cq);
@@ -622 +634 @@
-    row_count = PQntuples(d->res);
-    if(row_count != 1) {
+      noitL(noit_debug, "lookup (sid:%d): NOT THERE!\n", node->sid, val);
-      PQclear(d->res);
-      goto bad_row;
-    }
-
-    /* Get the check uuid */
-    PG_GET_STR_COL(val, 0, "id");
-    if(!val) {
-      PQclear(d->res);
-      goto bad_row;
-    }
-    if(uuid_parse(val, node->checkid)) {
-      PQclear(d->res);
-      goto bad_row;
-    }
-  
-    /* Get the remote_address (which noit owns this) */
-    PG_GET_STR_COL(val, 0, "remote_address");
-    if(!val) {
+      noitL(noit_debug, "lookup: %s -> NOT THERE!\n", remote_cn);
-      PQclear(d->res);
-      goto bad_row;
-    }
-    node->noit = strdup(val);
-
+   noitL(noit_debug, "lookup: %s -> %s\n", remote_cn, node->noit);
-   bad_row: 
-    free_params((ds_single_detail *)d);

src/stratcon_jlog_streamer.c

@@ -56 +56 @@
-pthread_mutex_t noits_lock;
-noit_hash_table noits = NOIT_HASH_EMPTY;
+pthread_mutex_t noit_ip_by_cn_lock;
+noit_hash_table noit_ip_by_cn = NOIT_HASH_EMPTY;
-
-static void noit_connection_initiate_connection(noit_connection_ctx_t *ctx);
@@ -788 +790 @@
-  free(noit_configs);
-}
+int
+stratcon_find_noit_ip_by_cn(const char *cn, char *ip, int len) {
+  int rv = -1;
+  void *vip;
+  pthread_mutex_lock(&noit_ip_by_cn_lock);
+  if(noit_hash_retrieve(&noit_ip_by_cn, cn, strlen(cn), &vip)) {
+    int new_len;
+    char *new_ip = (char *)vip;
+    new_len = strlen(new_ip);
+    strlcpy(ip, new_ip, len);
+    if(new_len >= len) rv = new_len+1;
+    else rv = 0;
+  }
+  pthread_mutex_unlock(&noit_ip_by_cn_lock);
+  return rv;
+}
+void
+stratcon_jlog_streamer_recache_noit() {
+  int di, cnt;
+  noit_conf_section_t *noit_configs;
+  noit_configs = noit_conf_get_sections(NULL, "//noits//noit", &cnt);
+  pthread_mutex_lock(&noit_ip_by_cn_lock);
+  noit_hash_delete_all(&noit_ip_by_cn, free, free);
+  for(di=0; di<cnt; di++) {
+    char address[64];
+    if(noit_conf_get_stringbuf(noit_configs[di], "self::node()/@address",
+                                 address, sizeof(address))) {
+      char expected_cn[256];
+      if(noit_conf_get_stringbuf(noit_configs[di], "self::node()/config/cn",
+                                 expected_cn, sizeof(expected_cn)))
+        noit_hash_store(&noit_ip_by_cn,
+                        strdup(expected_cn), strlen(expected_cn),
+                        strdup(address));
+    }
+  }
+  free(noit_configs);
+  pthread_mutex_unlock(&noit_ip_by_cn_lock);
+}
-void
-stratcon_jlog_streamer_reload(const char *toplevel) {
+  /* flush and repopulate the cn cache */
+  stratcon_jlog_streamer_recache_noit();
-  if(!stratcon_datastore_get_enabled()) return;
-  stratcon_streamer_connection(toplevel, NULL,
@@ -1029 +1071 @@
-    xmlAddChild(config, cnnode);
-    xmlAddChild(newnoit, config);
+    pthread_mutex_lock(&noit_ip_by_cn_lock);
+    noit_hash_replace(&noit_ip_by_cn, strdup(cn), strlen(cn),
+                      strdup(target), free, free);
+    pthread_mutex_unlock(&noit_ip_by_cn_lock);
-  }
-  if(stratcon_datastore_get_enabled())
@@ -1061 +1107 @@
-  noit_configs = noit_conf_get_sections(NULL, path, &cnt);
-  for(i=0; i<cnt; i++) {
+    char expected_cn[256];
+    if(noit_conf_get_stringbuf(noit_configs[i], "self::node()/config/cn",
+                               expected_cn, sizeof(expected_cn))) {
+      pthread_mutex_lock(&noit_ip_by_cn_lock);
+      noit_hash_delete(&noit_ip_by_cn, expected_cn, strlen(expected_cn),
+                       free, free);
+      pthread_mutex_unlock(&noit_ip_by_cn_lock);
+    }
-    xmlUnlinkNode(noit_configs[i]);
-    xmlFreeNode(noit_configs[i]);
@@ -1186 +1240 @@
-stratcon_jlog_streamer_init(const char *toplevel) {
-  pthread_mutex_init(&noits_lock, NULL);
+  pthread_mutex_init(&noit_ip_by_cn_lock, NULL);
-  eventer_name_callback("noit_connection_reinitiate",
-                        noit_connection_reinitiate);

src/stratcon_jlog_streamer.h

@@ -115 +115 @@
-                               void (*handler_free)(void *));
-
+/*! \fn int stratcon_find_noit_ip_by_cn(const char *cn, char *ip, int len)
+    \brief find the remote IPv4 address for the cn if it is configured
+    \param cn the remote CN in which you are interested
+    \param ip the buffer where the IP will be stored if it is found
+    \param len the length of the passed buffer
+    \return 0 on success, -1 if the CN is not in the cache, > 0 represents the size needed if the supplied buffer is too short.
+ */
+
+API_EXPORT(int)
+  stratcon_find_noit_ip_by_cn(const char *cn, char *ip, int len);
+
+
-#endif