Changeset ae8bf798b9af68dc0cd9559a4e9c8076b47575f1

Timestamp:

11/18/09 20:00:24 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[f8b58d6bc1f33a57d7e2f8079b5b8f5b30e7fabb]

git-author:

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

Message:

Fix readdir on solaris and a bug in fetching the fqdn for storage nodes

Files:

• src/man/Makefile.in (modified) (2 diffs)
• src/noit_defines.h (modified) (1 diff)
• src/stratcon_datastore.c (modified) (11 diffs)
• src/stratcon_jlog_streamer.c (modified) (1 diff)

src/man/Makefile.in

@@ -30 +30 @@
-noitd.usage.h:  noitd.8
-        @echo " - creating $@"
-doc
+
-                $(top_srcdir)/buildtools/xml2h NOITD_USAGE > $@
-
@@ -41 +41 @@
-stratcond.usage.h:      stratcond.8
-        @echo " - creating $@"
-doc
+
-                $(top_srcdir)/buildtools/xml2h STRATCOND_USAGE > $@
-

src/noit_defines.h

@@ -133 +133 @@
-}
-
-
-*c) = readdir_r(a,b)
+ && !defined(_POSIX_PTHREAD_SEMANTICS)
+(*c) = readdir_r(a,b)) != NULL
-#else
-#define portable_readdir_r readdir_r

src/stratcon_datastore.c

@@ -484 +484 @@
-  int i, row_count = 0, good = 0;
-  char buff[1024];
-
-
+
+
+
+
-  cq = get_conn_q_for_remote(NULL,NULL,sn->fqdn,sn->dsn);
-  i = 0;
@@ -496 +498 @@
-    sleep(1);
-  }
-  d = calloc(1, sizeof(*d));
-  GET_QUERY(check_loadall);
-  PG_EXEC(check_loadall);
-  row_count = PQntuples(d->res);
@@ -537 +537 @@
-  free_params((ds_single_detail *)d);
-  free(d);
-
+if(cq) 
-  return (void *)(vpsized_int)good;
-}
@@ -1326 +1326 @@
-    uuidinfo = vuuidinfo;
-
-
-
-
+
+
-      /* we don't have dsn and we actually want it */
-      pthread_mutex_lock(&storagenode_to_info_cache_lock);
-      if(noit_hash_retrieve(&storagenode_to_info_cache,
-
+
+
-        info = vinfo;
-      pthread_mutex_unlock(&storagenode_to_info_cache_lock);
@@ -1373 +1373 @@
-                                    &storagenode_id, NULL, &fqdn, &dsn);
-          ij = interim_journal_get(remote, remote_cn, storagenode_id, fqdn);
+noitL(noit_error, " %s -> %d/%s { fd: %d, path: %s }\n", uuid_str, storagenode_id, fqdn,
+      ij->fd, ij->filename);
-        }
-      }
@@ -1533 +1535 @@
-  char path[PATH_MAX];
-  DIR *root;
-
+*
-  int i = 0, cnt = 0;
-  char **entries;
+  int size = 0;
-
-  snprintf(path, sizeof(path), "%s%s%s%s%s%s%s", basejpath,
@@ -1541 +1544 @@
-           second ? "/" : "", second ? second : "",
-           third ? "/" : "", third ? third : "");
+#ifdef _PC_NAME_MAX
+  size = pathconf(path, _PC_NAME_MAX);
+#endif
+  size = MIN(size, PATH_MAX + 128);
+  de = alloca(size);
-  root = opendir(path);
-  if(!root) return;
-&de, &entry) =
+de, &entry) !
-  closedir(root);
-  root = opendir(path);
-  if(!root) return;
-  entries = malloc(sizeof(*entries) * cnt);
-&de, &entry) =
+de, &entry) !
-    if(i < cnt) {
-      entries[i++] = strdup(entry->d_name);
@@ -1559 +1567 @@
-  for(i=0; i<cnt; i++) {
-    if(!strcmp(entries[i], ".") || !strcmp(entries[i], "..")) continue;
+    noitL(ds_deb, "Processing L%d entry '%s'\n",
+          third ? 4 : second ? 3 : first ? 2 : 1, entries[i]);
-    if(!first)
-      stratcon_datastore_sweep_journals_int(entries[i], NULL, NULL);
@@ -1609 +1619 @@
-      noit_hash_store(&storagenode_to_info_cache,
-                      (void *)&info->storagenode_id, sizeof(int), info);
+      noitL(ds_deb, "SN[%d] -> { fqdn: '%s', dsn: '%s' }\n",
+            info->storagenode_id,
+            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : "");
-    }
-  }
@@ -1657 +1670 @@
-    noit_hash_store(&uuid_to_info_cache,
-                    uuidinfo->uuid_str, strlen(uuidinfo->uuid_str), uuidinfo);
+    noitL(ds_deb, "CHECK[%s] -> { remote_cn: '%s', storagenode_id: '%d' }\n",
+          uuidinfo->uuid_str, uuidinfo->remote_cn, uuidinfo->storagenode_id);
-    loaded++;
-    if(!noit_hash_retrieve(&storagenode_to_info_cache,
@@ -1667 +1682 @@
-      noit_hash_store(&storagenode_to_info_cache,
-                      (void *)&info->storagenode_id, sizeof(int), info);
+      noitL(ds_deb, "SN[%d] -> { fqdn: '%s', dsn: '%s' }\n",
+            info->storagenode_id,
+            info->fqdn ? info->fqdn : "", info->dsn ? info->dsn : "");
-    }
-  }

src/stratcon_jlog_streamer.c

@@ -439 +439 @@
-        ctx->state = JLOG_STREAMER_WANT_CHKPT; /* falls through */
-      case JLOG_STREAMER_WANT_CHKPT:
-
+
+
-              ctx->header.chkpt.log, ctx->header.chkpt.marker);
-        n_chkpt.log = htonl(ctx->header.chkpt.log);