{
static cnid_t id;
static char buf[ROOTINFO_DATALEN];
- DBT rootinfo_key, rootinfo_data;
+ DBT rootinfo_key, rootinfo_data, key, data;
int rc;
cnid_t hint;
rootinfo_key.data = ROOTINFO_KEY;
rootinfo_key.size = ROOTINFO_KEYLEN;
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+
if (id == 0) {
- if ((rc = dbif_get(dbd, DBIF_CNID, &rootinfo_key, &rootinfo_data, 0)) < 0) {
+ if ((rc = dbif_get(dbd, DBIF_CNID, &rootinfo_key, &rootinfo_data, 0)) != 1) {
rply->result = CNID_DBD_RES_ERR_DB;
return -1;
}
- if (rc == 0) {
- /* no rootinfo key yet */
- memcpy(buf, ROOTINFO_DATA, ROOTINFO_DATALEN);
+ memcpy(buf, (char *)rootinfo_data.data, ROOTINFO_DATALEN);
+ memcpy(&hint, buf + CNID_TYPE_OFS, sizeof(hint));
+ id = ntohl(hint);
+ if (id < CNID_START - 1)
id = CNID_START - 1;
- } else {
- memcpy(buf, (char *)rootinfo_data.data, ROOTINFO_DATALEN);
- memcpy(&hint, buf + CNID_TYPE_OFS, sizeof(hint));
- id = ntohl(hint);
- if (id < CNID_START - 1)
- id = CNID_START - 1;
- }
}
- /* If we've hit the max CNID allowed, we return an error. CNID
- * needs to be recycled before proceding. */
- if (++id == CNID_INVALID) {
- rply->result = CNID_DBD_RES_ERR_MAX;
- return -1;
+ cnid_t trycnid, tmp;
+
+ while (true) {
+ if (rply->cnid != CNID_INVALID) {
+ trycnid = ntohl(rply->cnid);
+ rply->cnid = CNID_INVALID;
+ } else {
+ if (++id == CNID_INVALID)
+ id = CNID_START;
+ trycnid = id;
+ }
+ tmp = htonl(trycnid);
+ key.data = &tmp;
+ key.size = sizeof(cnid_t);
+ rc = dbif_get(dbd, DBIF_CNID, &key, &data, 0);
+ if (rc == 0) {
+ break;
+ } else if (rc == -1) {
+ rply->result = CNID_DBD_RES_ERR_DB;
+ return -1;
+ }
}
- rootinfo_data.data = buf;
- rootinfo_data.size = ROOTINFO_DATALEN;
- hint = htonl(id);
- memcpy(buf + CNID_TYPE_OFS, &hint, sizeof(hint));
+ if (trycnid == id) {
+ rootinfo_data.data = buf;
+ rootinfo_data.size = ROOTINFO_DATALEN;
+ hint = htonl(id);
+ memcpy(buf + CNID_TYPE_OFS, &hint, sizeof(hint));
- if (dbif_put(dbd, DBIF_CNID, &rootinfo_key, &rootinfo_data, 0) < 0) {
- rply->result = CNID_DBD_RES_ERR_DB;
- return -1;
+ if (dbif_put(dbd, DBIF_CNID, &rootinfo_key, &rootinfo_data, 0) < 0) {
+ rply->result = CNID_DBD_RES_ERR_DB;
+ return -1;
+ }
}
- rply->cnid = hint;
+
+ rply->cnid = htonl(trycnid);
return 0;
}
LOG(log_debug, logtype_cnid, "dbd_add(did:%u, '%s', dev/ino:0x%llx/0x%llx): {adding to database ...}",
ntohl(rqst->did), rqst->name, (unsigned long long)rqst->dev, (unsigned long long)rqst->ino);
-
+ if (rqst->cnid) {
+ /* rqst->cnid is the cnid "hint"/backup from the adouble file */
+ rply->cnid = rqst->cnid;
+ }
if (get_cnid(dbd, rply) < 0) {
if (rply->result == CNID_DBD_RES_ERR_MAX) {
LOG(log_error, logtype_cnid, "dbd_add: FATAL: CNID database has reached its limit.");
#include <atalk/logger.h>
#include <atalk/util.h>
#include <atalk/errchk.h>
+#include <atalk/cnid.h>
#include "db_param.h"
#include "dbif.h"
static int dbif_init_rootinfo(DBD *dbd, int version)
{
DBT key, data;
- uint32_t v;
+ uint32_t uint32;
char buf[ROOTINFO_DATALEN];
LOG(log_debug, logtype_cnid, "Setting CNID database version to %u", version);
- v = version;
- v = htonl(v);
memset(&key, 0, sizeof(key));
memset(&data, 0, sizeof(data));
data.size = ROOTINFO_DATALEN;
memcpy(buf, ROOTINFO_DATA, ROOTINFO_DATALEN);
- memcpy(buf + CNID_DID_OFS, &v, sizeof(v));
+
+ uint32 = htonl(CNID_START - 1);
+ memcpy(buf + CNID_TYPE_OFS, &uint32, sizeof(uint32));
+
+ uint32 = htonl(version);
+ memcpy(buf + CNID_DID_OFS, &uint32, sizeof(uint32));
+
if (dbif_stamp(dbd, buf + CNID_DEV_OFS, CNID_DEV_LEN) < 0)
return -1;
return ret;
}
-/*!
- * Get lock on db lock file
- *
- * @args cmd (r) lock command:
- * LOCK_FREE: close lockfd
- * LOCK_UNLOCK: unlock lockm keep lockfd open
- * LOCK_EXCL: F_WRLCK on lockfd
- * LOCK_SHRD: F_RDLCK on lockfd
- * @args dbpath (r) path to lockfile, only used on first call,
- * later the stored fd is used
- * @returns LOCK_FREE/LOCK_UNLOCK return 0 on success, -1 on error
- * LOCK_EXCL/LOCK_SHRD return LOCK_EXCL or LOCK_SHRD respectively on
- * success, 0 if the lock couldn't be acquired, -1 on other errors
- */
-int get_lock(int cmd, const char *dbpath)
-{
- static int lockfd = -1;
- int ret;
- char lockpath[PATH_MAX];
- struct stat st;
-
- LOG(log_debug, logtype_cnid, "get_lock(%s, \"%s\")",
- cmd == LOCK_EXCL ? "LOCK_EXCL" :
- cmd == LOCK_SHRD ? "LOCK_SHRD" :
- cmd == LOCK_FREE ? "LOCK_FREE" :
- cmd == LOCK_UNLOCK ? "LOCK_UNLOCK" : "UNKNOWN" , dbpath ? dbpath : "");
-
- switch (cmd) {
- case LOCK_FREE:
- if (lockfd == -1)
- return -1;
- close(lockfd);
- lockfd = -1;
- return 0;
-
- case LOCK_UNLOCK:
- if (lockfd == -1)
- return -1;
- return unlock(lockfd, 0, SEEK_SET, 0);
-
- case LOCK_EXCL:
- case LOCK_SHRD:
- if (lockfd == -1) {
- if ( (strlen(dbpath) + strlen(LOCKFILENAME+1)) > (PATH_MAX - 1) ) {
- LOG(log_error, logtype_cnid, ".AppleDB pathname too long");
- return -1;
- }
- strncpy(lockpath, dbpath, PATH_MAX - 1);
- strcat(lockpath, "/");
- strcat(lockpath, LOCKFILENAME);
-
- if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0644)) < 0) {
- LOG(log_error, logtype_cnid, "Error opening lockfile: %s", strerror(errno));
- return -1;
- }
-
- if ((stat(dbpath, &st)) != 0) {
- LOG(log_error, logtype_cnid, "Error statting lockfile: %s", strerror(errno));
- return -1;
- }
-
- if ((chown(lockpath, st.st_uid, st.st_gid)) != 0) {
- LOG(log_error, logtype_cnid, "Error inheriting lockfile permissions: %s",
- strerror(errno));
- return -1;
- }
- }
-
- if (cmd == LOCK_EXCL)
- ret = write_lock(lockfd, 0, SEEK_SET, 0);
- else
- ret = read_lock(lockfd, 0, SEEK_SET, 0);
-
- if (ret != 0) {
- if (cmd == LOCK_SHRD)
- LOG(log_error, logtype_cnid, "Volume CNID db is locked, try again...");
- return 0;
- }
-
- LOG(log_debug, logtype_cnid, "get_lock: got %s lock",
- cmd == LOCK_EXCL ? "LOCK_EXCL" : "LOCK_SHRD");
- return cmd;
-
- default:
- return -1;
- } /* switch(cmd) */
-
- /* deadc0de, never get here */
- return -1;
-}
-
/* --------------- */
DBD *dbif_init(const char *envhome, const char *filename)
{
LOG(log_debug, logtype_cnid, "Trying to remove BerkeleyDB environment");
- if (get_lock(LOCK_EXCL, path) != LOCK_EXCL) {
- LOG(log_debug, logtype_cnid, "CNID db \"%s\" in use, not removing BerkeleyDB environment", path);
- return 0;
- }
-
if (NULL == (dbd = dbif_init(path, "cnid2.db")))
return -1;
#include <atalk/errchk.h>
#include <atalk/bstrlib.h>
#include <atalk/netatalk_conf.h>
+#include <atalk/util.h>
#include "db_param.h"
#include "dbif.h"
static int db_locked;
static bstring dbpath;
static struct db_param *dbp;
+static struct vol *vol;
static void sig_exit(int signo)
{
of the cnid_dbd_rply structure contains further details.
*/
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
-#endif
+
+/*!
+ * Get lock on db lock file
+ *
+ * @args cmd (r) lock command:
+ * LOCK_FREE: close lockfd
+ * LOCK_UNLOCK: unlock lockm keep lockfd open
+ * LOCK_EXCL: F_WRLCK on lockfd
+ * LOCK_SHRD: F_RDLCK on lockfd
+ * @args dbpath (r) path to lockfile, only used on first call,
+ * later the stored fd is used
+ * @returns LOCK_FREE/LOCK_UNLOCK return 0 on success, -1 on error
+ * LOCK_EXCL/LOCK_SHRD return LOCK_EXCL or LOCK_SHRD respectively on
+ * success, 0 if the lock couldn't be acquired, -1 on other errors
+ */
+static int get_lock(int cmd, const char *dbpath)
+{
+ static int lockfd = -1;
+ int ret;
+ char lockpath[PATH_MAX];
+ struct stat st;
+
+ LOG(log_debug, logtype_cnid, "get_lock(%s, \"%s\")",
+ cmd == LOCK_EXCL ? "LOCK_EXCL" :
+ cmd == LOCK_SHRD ? "LOCK_SHRD" :
+ cmd == LOCK_FREE ? "LOCK_FREE" :
+ cmd == LOCK_UNLOCK ? "LOCK_UNLOCK" : "UNKNOWN",
+ dbpath ? dbpath : "");
+
+ switch (cmd) {
+ case LOCK_FREE:
+ if (lockfd == -1)
+ return -1;
+ close(lockfd);
+ lockfd = -1;
+ return 0;
+
+ case LOCK_UNLOCK:
+ if (lockfd == -1)
+ return -1;
+ return unlock(lockfd, 0, SEEK_SET, 0);
+
+ case LOCK_EXCL:
+ case LOCK_SHRD:
+ if (lockfd == -1) {
+ if ( (strlen(dbpath) + strlen(LOCKFILENAME+1)) > (PATH_MAX - 1) ) {
+ LOG(log_error, logtype_cnid, ".AppleDB pathname too long");
+ return -1;
+ }
+ strncpy(lockpath, dbpath, PATH_MAX - 1);
+ strcat(lockpath, "/");
+ strcat(lockpath, LOCKFILENAME);
+
+ if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0644)) < 0) {
+ LOG(log_error, logtype_cnid, "Error opening lockfile: %s", strerror(errno));
+ return -1;
+ }
+
+ if ((stat(dbpath, &st)) != 0) {
+ LOG(log_error, logtype_cnid, "Error statting lockfile: %s", strerror(errno));
+ return -1;
+ }
+
+ if ((chown(lockpath, st.st_uid, st.st_gid)) != 0) {
+ LOG(log_error, logtype_cnid, "Error inheriting lockfile permissions: %s",
+ strerror(errno));
+ return -1;
+ }
+ }
+
+ if (cmd == LOCK_EXCL)
+ ret = write_lock(lockfd, 0, SEEK_SET, 0);
+ else
+ ret = read_lock(lockfd, 0, SEEK_SET, 0);
+
+ if (ret != 0) {
+ if (cmd == LOCK_SHRD)
+ LOG(log_error, logtype_cnid, "Volume CNID db is locked, try again...");
+ return 0;
+ }
+
+ LOG(log_debug, logtype_cnid, "get_lock: got %s lock",
+ cmd == LOCK_EXCL ? "LOCK_EXCL" : "LOCK_SHRD");
+ return cmd;
+
+ default:
+ return -1;
+ } /* switch(cmd) */
+
+ /* deadc0de, never get here */
+ return -1;
+}
+
+static int open_db(void)
+{
+ EC_INIT;
+
+ /* Get db lock */
+ if ((db_locked = get_lock(LOCK_EXCL, bdata(dbpath))) != LOCK_EXCL) {
+ LOG(log_error, logtype_cnid, "main: fatal db lock error");
+ EC_FAIL;
+ }
+
+ if (NULL == (dbd = dbif_init(bdata(dbpath), "cnid2.db")))
+ EC_FAIL;
+
+ /* Only recover if we got the lock */
+ if (dbif_env_open(dbd, dbp, DBOPTIONS | DB_RECOVER) < 0)
+ EC_FAIL;
+
+ LOG(log_debug, logtype_cnid, "Finished initializing BerkeleyDB environment");
+
+ if (dbif_open(dbd, dbp, 0) < 0)
+ EC_FAIL;
+
+ LOG(log_debug, logtype_cnid, "Finished opening BerkeleyDB databases");
+
+EC_CLEANUP:
+ if (ret != 0) {
+ if (dbd) {
+ (void)dbif_close(dbd);
+ dbd = NULL;
+ }
+ }
+
+ EC_EXIT;
+}
static int delete_db(void)
{
EC_INIT;
int cwd = -1;
+ EC_ZERO( get_lock(LOCK_FREE, bdata(dbpath)) );
EC_NEG1( cwd = open(".", O_RDONLY) );
-
chdir(bdata(dbpath));
system("rm -f cnid2.db lock log.* __db.*");
+
if ((db_locked = get_lock(LOCK_EXCL, bdata(dbpath))) != LOCK_EXCL) {
LOG(log_error, logtype_cnid, "main: fatal db lock error");
EC_FAIL;
}
+ LOG(log_warning, logtype_cnid, "Recreated CNID BerkeleyDB databases of volume \"%s\"", vol->v_localname);
+
EC_CLEANUP:
if (cwd != -1)
fchdir(cwd);
EC_EXIT;
}
-static int wipe_db(void)
+
+/**
+ * Close dbd if open, delete it, reopen
+ *
+ * Also tries to copy the rootinfo key, that would allow for keeping the db stamp
+ * and last used CNID
+ **/
+static int reinit_db(void)
{
EC_INIT;
DBT key, data;
+ bool copyRootInfo;
- memset(&key, 0, sizeof(key));
- memset(&data, 0, sizeof(data));
+ if (dbd) {
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
- key.data = ROOTINFO_KEY;
- key.size = ROOTINFO_KEYLEN;
+ key.data = ROOTINFO_KEY;
+ key.size = ROOTINFO_KEYLEN;
- if (dbif_get(dbd, DBIF_CNID, &key, &data, 0) <= 0) {
- LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error getting rootinfo record");
- EC_FAIL;
+ if (dbif_get(dbd, DBIF_CNID, &key, &data, 0) <= 0) {
+ LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error getting rootinfo record");
+ copyRootInfo = false;
+ } else {
+ copyRootInfo = true;
+ }
+ (void)dbif_close(dbd);
}
- EC_NEG1_LOG( dbif_close(dbd) );
- EC_NEG1_LOG( dbif_env_remove(bdata(dbpath)) );
EC_ZERO_LOG( delete_db() );
+ EC_ZERO_LOG( open_db() );
- /* Get db lock */
- if ((db_locked = get_lock(LOCK_EXCL, bdata(dbpath))) != LOCK_EXCL) {
- LOG(log_error, logtype_cnid, "main: fatal db lock error");
- EC_FAIL;
- }
-
- EC_NULL_LOG( dbd = dbif_init(bdata(dbpath), "cnid2.db") );
-
- /* Only recover if we got the lock */
- EC_NEG1_LOG( dbif_env_open(dbd, dbp, DBOPTIONS | DB_RECOVER) );
+ if (copyRootInfo == true) {
+ memset(&key, 0, sizeof(key));
+ key.data = ROOTINFO_KEY;
+ key.size = ROOTINFO_KEYLEN;
- LOG(log_debug, logtype_cnid, "Finished initializing BerkeleyDB environment");
-
- EC_NEG1_LOG( dbif_open(dbd, dbp, 0) );
-
- memset(&key, 0, sizeof(key));
- key.data = ROOTINFO_KEY;
- key.size = ROOTINFO_KEYLEN;
-
- if (dbif_put(dbd, DBIF_CNID, &key, &data, 0) != 0) {
- LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error writing rootinfo key");
- EC_FAIL;
+ if (dbif_put(dbd, DBIF_CNID, &key, &data, 0) != 0) {
+ LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error writing rootinfo key");
+ EC_FAIL;
+ }
}
EC_CLEANUP:
dbp->flush_interval, timebuf);
while (1) {
- timeout = min(time_next_flush, time_last_rqst +dbp->idle_timeout);
+ timeout = MIN(time_next_flush, time_last_rqst + dbp->idle_timeout);
if (timeout > now)
timeout -= now;
else
ret = dbd_search(dbd, &rqst, &rply);
break;
case CNID_DBD_OP_WIPE:
- ret = wipe_db();
+ ret = reinit_db();
break;
default:
LOG(log_error, logtype_cnid, "loop: unknown op %d", rqst.op);
int ctrlfd = -1, clntfd = -1;
char *logconfig;
AFPObj obj = { 0 };
- struct vol *vol;
char *volpath = NULL;
while (( ret = getopt( argc, argv, "dF:l:p:t:vV")) != -1 ) {
switch (ret) {
case 'd':
+ /* this is now just ignored, as we do it automatically anyway */
delete_bdb = 1;
break;
case 'F':
switch_to_user(bdata(dbpath));
- /* Get db lock */
- if ((db_locked = get_lock(LOCK_EXCL, bdata(dbpath))) != LOCK_EXCL) {
- LOG(log_error, logtype_cnid, "main: fatal db lock error");
- EC_FAIL;
- }
-
- if (delete_bdb) {
- LOG(log_warning, logtype_cnid, "main: too many CNID db opening attempts, wiping the slate clean");
- EC_ZERO( delete_db() );
- }
-
set_signal();
/* SIGINT and SIGTERM are always off, unless we are in pselect */
EC_FAIL;
LOG(log_maxdebug, logtype_cnid, "Finished parsing db_param config file");
- if (NULL == (dbd = dbif_init(bdata(dbpath), "cnid2.db")))
- EC_FAIL;
-
- /* Only recover if we got the lock */
- if (dbif_env_open(dbd,
- dbp,
- (db_locked == LOCK_EXCL) ? DBOPTIONS | DB_RECOVER : DBOPTIONS) < 0)
- EC_FAIL;
- LOG(log_debug, logtype_cnid, "Finished initializing BerkeleyDB environment");
-
- if (dbif_open(dbd, dbp, 0) < 0) {
- ret = -1;
- goto close_db;
- }
-
- LOG(log_debug, logtype_cnid, "Finished opening BerkeleyDB databases");
-
- /* Downgrade db lock */
- if (db_locked == LOCK_EXCL) {
- if (get_lock(LOCK_UNLOCK, NULL) != 0) {
- ret = -1;
- goto close_db;
- }
-
- if (get_lock(LOCK_SHRD, NULL) != LOCK_SHRD) {
- ret = -1;
- goto close_db;
- }
+ if (open_db() != 0) {
+ LOG(log_error, logtype_cnid, "Failed to open CNID database for volume \"%s\"", vol->v_localname);
+ EC_ZERO_LOG( reinit_db() );
}
-
if (comm_init(dbp, ctrlfd, clntfd) < 0) {
ret = -1;
goto close_db;
projects / netatalk.git / commitdiff