Changeset 9773c9f2c8f4413f348fed53ebb19681bfdfd074

Timestamp:

02/03/10 22:39:30 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[64c8a576fd9f20f60a5321197e4800e9ce80bb60]

git-author:

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

Message:

if I don't know the remote_cn, it should return it to me should I pass in null

Files:

• src/stratcon.conf.in (modified) (1 diff)
• src/stratcon_datastore.c (modified) (7 diffs)

src/stratcon.conf.in

@@ -120 +120 @@
-      <mapchecktostoragenode><![CDATA[
-        SELECT o_storage_node_id as storage_node_id, o_sid as sid,
-
+, o_noit as remote_cn
-          FROM stratcon.map_uuid_to_sid($1,$2)
-      ]]></mapchecktostoragenode>

src/stratcon_datastore.c

@@ -612 +612 @@
-      continue;
-
+    noitL(noit_error, "stratcon_datastore_find <- (%d, %s)\n", node->sid, remote_cn);
-    cq = get_conn_q_for_remote(NULL, remote_cn, fqdn, dsn);
-    stratcon_database_connect(cq);
@@ -1301 +1302 @@
-  char *fqdn = NULL;
-  char *dsn = NULL;
+  char *new_remote_cn = NULL;
-  int storagenode_id = 0, sid = 0;
-  if(!noit_hash_retrieve(&uuid_to_info_cache, uuid_str, strlen(uuid_str),
@@ -1310 +1312 @@
-
-    /* We can't do a database lookup without the remote_cn */
-
+
+
+
+
+
+
+
+
-
-    d = calloc(1, sizeof(*d));
@@ -1326 +1335 @@
-      }
-      PG_GET_STR_COL(tmpint, 0, "sid");
+      if(!tmpint) {
+        row_count = 0;
+        PQclear(d->res);
+        goto bad_row;
+      }
-      sid = atoi(tmpint);
-      PG_GET_STR_COL(tmpint, 0, "storage_node_id");
@@ -1331 +1345 @@
-      PG_GET_STR_COL(fqdn, 0, "fqdn");
-      PG_GET_STR_COL(dsn, 0, "dsn");
+      PG_GET_STR_COL(new_remote_cn, 0, "remote_cn");
-      PQclear(d->res);
-    }
@@ -1337 +1352 @@
-    free(d);
-    release_conn_q(cq);
-
+
+
+
-    /* Place in cache */
-    if(fqdn) fqdn = strdup(fqdn);
@@ -1344 +1361 @@
-    uuidinfo->uuid_str = strdup(uuid_str);
-    uuidinfo->storagenode_id = storagenode_id;
-
+new_
-    noit_hash_store(&uuid_to_info_cache,
-                    uuidinfo->uuid_str, strlen(uuidinfo->uuid_str), uuidinfo);