X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fcnid%2Fdbd%2Fcnid_dbd.c;h=60f16f9185efcaf4a1a7d4452b63691c9ac6885c;hb=df4786e567fddb4b238f658d43e2662f488f73ba;hp=2a34c8d3eda546927b2b6180d4532eb811f1a87e;hpb=dd3702eb7f9da67875f287c42d878db1242fd981;p=netatalk.git diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c index 2a34c8d3..60f16f91 100644 --- a/libatalk/cnid/dbd/cnid_dbd.c +++ b/libatalk/cnid/dbd/cnid_dbd.c @@ -1,7 +1,6 @@ /* - * $Id: cnid_dbd.c,v 1.14 2009-11-24 12:18:19 didg Exp $ - * * Copyright (C) Joerg Lenneis 2003 + * Copyright (C) Frank Lahm 2010 * All Rights Reserved. See COPYING. */ @@ -39,27 +38,24 @@ #include #include #include -#include "cnid_dbd.h" #include +#include + +#include "cnid_dbd.h" #ifndef SOL_TCP #define SOL_TCP IPPROTO_TCP #endif /* ! SOL_TCP */ +/* Wait MAX_DELAY seconds before a request to the CNID server times out */ +#define MAX_DELAY 20 +#define ONE_DELAY 5 + static void RQST_RESET(struct cnid_dbd_rqst *r) { memset(r, 0, sizeof(struct cnid_dbd_rqst )); } -/* ----------- */ -extern char *Cnid_srv; -extern char *Cnid_port; - -#define MAX_DELAY 40 - -/* *MUST* be < afp tickle or it's never triggered (got EINTR first) */ -#define SOCK_DELAY 11 - static void delay(int sec) { struct timeval tv; @@ -72,10 +68,11 @@ static void delay(int sec) static int tsock_getfd(const char *host, const char *port) { int sock = -1; - struct timeval tv; int attr; int err; struct addrinfo hints, *servinfo, *p; + int optval; + socklen_t optlen = sizeof(optval); /* Prepare hint for getaddrinfo */ memset(&hints, 0, sizeof hints); @@ -84,48 +81,93 @@ static int tsock_getfd(const char *host, const char *port) hints.ai_flags = AI_NUMERICSERV; if ((err = getaddrinfo(host, port, &hints, &servinfo)) != 0) { - LOG(log_error, logtype_default, "tsock_getfd: getaddrinfo: %s:%s : %s\n", host, port, gai_strerror(err)); + LOG(log_error, logtype_default, "tsock_getfd: getaddrinfo: CNID server %s:%s : %s\n", + host, port, gai_strerror(err)); return -1; } /* loop through all the results and bind to the first we can */ for (p = servinfo; p != NULL; p = p->ai_next) { if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) { - LOG(log_info, logtype_default, "tsock_getfd: socket %s:: %s", host, strerror(errno)); - continue; + LOG(log_info, logtype_default, "tsock_getfd: socket CNID server %s:: %s", + host, strerror(errno)); + continue; } attr = 1; if (setsockopt(sock, SOL_TCP, TCP_NODELAY, &attr, sizeof(attr)) == -1) { - LOG(log_error, logtype_cnid, "getfd: set TCP_NODELAY %s: %s", host, strerror(errno)); - close(sock); - continue; - } - - tv.tv_sec = SOCK_DELAY; - tv.tv_usec = 0; - if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) { - LOG(log_error, logtype_cnid, "getfd: set SO_RCVTIMEO %s: %s", host, strerror(errno)); + LOG(log_error, logtype_cnid, "getfd: set TCP_NODELAY CNID server %s: %s", + host, strerror(errno)); close(sock); - continue; + sock = -1; + return -1; } - tv.tv_sec = SOCK_DELAY; - tv.tv_usec = 0; - if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) { - LOG(log_error, logtype_cnid, "getfd: set SO_SNDTIMEO %s: %s", host, strerror(errno)); + if (setnonblock(sock, 1) != 0) { + LOG(log_error, logtype_cnid, "getfd: setnonblock: %s", strerror(err)); close(sock); - continue; + sock = -1; + return -1; } - + if (connect(sock, p->ai_addr, p->ai_addrlen) == -1) { - err = errno; - close(sock); - sock=-1; - LOG(log_error, logtype_cnid, "getfd: connect %s: %s", host, strerror(err)); - continue; + if (errno == EINPROGRESS) { + struct timeval tv; + tv.tv_usec = 0; + tv.tv_sec = 5; /* give it five seconds ... */ + fd_set wfds; + FD_ZERO(&wfds); + FD_SET(sock, &wfds); + + if ((err = select(sock + 1, NULL, &wfds, NULL, &tv)) == 0) { + /* timeout */ + LOG(log_error, logtype_cnid, "getfd: select timed out for CNID server %s", + host); + close(sock); + sock = -1; + continue; + } + if (err == -1) { + /* select failed */ + LOG(log_error, logtype_cnid, "getfd: select failed for CNID server %s", + host); + close(sock); + sock = -1; + continue; + } + + if ( ! FD_ISSET(sock, &wfds)) { + /* give up */ + LOG(log_error, logtype_cnid, "getfd: socket not ready connecting to %s", + host); + close(sock); + sock = -1; + continue; + } + + if ((err = getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen)) != 0 || optval != 0) { + if (err != 0) { + /* somethings very wrong */ + LOG(log_error, logtype_cnid, "getfd: getsockopt error with CNID server %s: %s", + host, strerror(errno)); + } else { + errno = optval; + LOG(log_error, logtype_cnid, "getfd: getsockopt says: %s", + strerror(errno)); + } + close(sock); + sock = -1; + continue; + } + } else { + LOG(log_error, logtype_cnid, "getfd: connect CNID server %s: %s", + host, strerror(errno)); + close(sock); + sock = -1; + continue; + } } - + /* We've got a socket */ break; } @@ -133,49 +175,57 @@ static int tsock_getfd(const char *host, const char *port) freeaddrinfo(servinfo); if (p == NULL) { - LOG(log_error, logtype_cnid, "tsock_getfd: no suitable network config from %s:%s", host, port); + errno = optval; + LOG(log_error, logtype_cnid, "tsock_getfd: no suitable network config from CNID server (%s:%s): %s", + host, port, strerror(errno)); return -1; } return(sock); } -/* --------------------- */ -static int write_vec(int fd, struct iovec *iov, size_t towrite) +/*! + * Write "towrite" bytes using writev on non-blocking fd + * + * Every short write is considered an error, transmit can handle that. + * + * @param fd (r) socket fd which must be non-blocking + * @param iov (r) iovec for writev + * @param towrite (r) number of bytes in all iovec elements + * @param vecs (r) number of iovecs in array + * + * @returns "towrite" bytes written or -1 on error + */ +static int write_vec(int fd, struct iovec *iov, ssize_t towrite, int vecs) { ssize_t len; - size_t len1; + int slept = 0; + int sleepsecs; - LOG(log_maxdebug, logtype_cnid, "write_vec: request to write %d bytes", towrite); + while (1) { + if (((len = writev(fd, iov, vecs)) == -1 && errno == EINTR)) + continue; - len1 = iov[1].iov_len; - while (towrite > 0) { - if (((len = writev(fd, iov, 2)) == -1 && errno == EINTR) || !len) + if ((! slept) && len == -1 && errno == EAGAIN) { + sleepsecs = 2; + while ((sleepsecs = sleep(sleepsecs))); + slept = 1; continue; + } - if ((size_t)len == towrite) /* wrote everything out */ + if (len == towrite) /* wrote everything out */ break; - else if (len < 0) { /* error */ - return -1; - } - towrite -= len; - if (towrite > len1) { /* skip part of header */ - iov[0].iov_base = (char *) iov[0].iov_base + len; - iov[0].iov_len -= len; - } else { /* skip to data */ - if (iov[0].iov_len) { - len -= iov[0].iov_len; - iov[0].iov_len = 0; - } - iov[1].iov_base = (char *) iov[1].iov_base + len; - iov[1].iov_len -= len; - } + if (len == -1) + LOG(log_error, logtype_cnid, "write_vec: %s", strerror(errno)); + else + LOG(log_error, logtype_cnid, "write_vec: short write: %d", len); + return len; } - LOG(log_maxdebug, logtype_cnid, "write_vec: wrote %d bytes", towrite); + LOG(log_maxdebug, logtype_cnid, "write_vec: wrote %d bytes", len); - return 0; + return len; } /* --------------------- */ @@ -185,9 +235,10 @@ static int init_tsock(CNID_private *db) int len; struct iovec iov[2]; - LOG(log_debug, logtype_cnid, "init_tsock: BEGIN. Opening volume '%s', CNID Server: %s/%s", db->db_dir, Cnid_srv, Cnid_port); + LOG(log_debug, logtype_cnid, "init_tsock: BEGIN. Opening volume '%s', CNID Server: %s/%s", + db->db_dir, db->cnidserver, db->cnidport); - if ((fd = tsock_getfd(Cnid_srv, Cnid_port)) < 0) + if ((fd = tsock_getfd(db->cnidserver, db->cnidport)) < 0) return -1; len = strlen(db->db_dir); @@ -198,7 +249,7 @@ static int init_tsock(CNID_private *db) iov[1].iov_base = db->db_dir; iov[1].iov_len = len; - if (write_vec(fd, iov, len + sizeof(int)) < 0) { + if (write_vec(fd, iov, len + sizeof(int), 2) != len + sizeof(int)) { LOG(log_error, logtype_cnid, "init_tsock: Error/short write: %s", strerror(errno)); close(fd); return -1; @@ -214,34 +265,27 @@ static int send_packet(CNID_private *db, struct cnid_dbd_rqst *rqst) { struct iovec iov[2]; size_t towrite; - - LOG(log_maxdebug, logtype_cnid, "send_packet: BEGIN"); - - if (!rqst->namelen) { - if (write(db->fd, rqst, sizeof(struct cnid_dbd_rqst)) != sizeof(struct cnid_dbd_rqst)) { - LOG(log_warning, logtype_cnid, "send_packet: Error/short write rqst (db_dir %s): %s", - db->db_dir, strerror(errno)); - return -1; - } - LOG(log_maxdebug, logtype_cnid, "send_packet: OK"); - return 0; - } + int vecs; iov[0].iov_base = rqst; iov[0].iov_len = sizeof(struct cnid_dbd_rqst); + towrite = sizeof(struct cnid_dbd_rqst); + vecs = 1; - iov[1].iov_base = rqst->name; - iov[1].iov_len = rqst->namelen; - - towrite = sizeof(struct cnid_dbd_rqst) +rqst->namelen; + if (rqst->namelen) { + iov[1].iov_base = rqst->name; + iov[1].iov_len = rqst->namelen; + towrite += rqst->namelen; + vecs++; + } - if (write_vec(db->fd, iov, towrite) < 0) { + if (write_vec(db->fd, iov, towrite, vecs) != towrite) { LOG(log_warning, logtype_cnid, "send_packet: Error writev rqst (db_dir %s): %s", db->db_dir, strerror(errno)); return -1; } - - LOG(log_maxdebug, logtype_cnid, "send_packet: OK"); + + LOG(log_maxdebug, logtype_cnid, "send_packet: {done}"); return 0; } @@ -268,28 +312,6 @@ static int dbd_reply_stamp(struct cnid_dbd_rply *rply) return 0; } -/* ------------------- */ -static ssize_t dbd_read(int socket, void *data, const size_t length) -{ - size_t stored; - ssize_t len; - - stored = 0; - while (stored < length) { - len = read(socket, (u_int8_t *) data + stored, length - stored); - if (len == -1) { - if (errno == EINTR) - continue; - return -1; - } - else if (len > 0) - stored += len; - else - break; - } - return stored; -} - /* --------------------- * send a request and get reply * assume send is non blocking @@ -301,19 +323,17 @@ static int dbd_rpc(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_dbd char *nametmp; size_t len; - LOG(log_maxdebug, logtype_cnid, "dbd_rpc: BEGIN"); - if (send_packet(db, rqst) < 0) { return -1; } len = rply->namelen; nametmp = rply->name; - ret = dbd_read(db->fd, rply, sizeof(struct cnid_dbd_rply)); + ret = readt(db->fd, rply, sizeof(struct cnid_dbd_rply), 0, ONE_DELAY); if (ret != sizeof(struct cnid_dbd_rply)) { LOG(log_error, logtype_cnid, "dbd_rpc: Error reading header from fd (db_dir %s): %s", - db->db_dir, ret == -1?strerror(errno):"closed"); + db->db_dir, ret == -1 ? strerror(errno) : "closed"); rply->name = nametmp; return -1; } @@ -324,13 +344,13 @@ static int dbd_rpc(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_dbd db->db_dir, rply->name, rply->namelen, len); return -1; } - if (rply->namelen && (ret = dbd_read(db->fd, rply->name, rply->namelen)) != (ssize_t)rply->namelen) { + if (rply->namelen && (ret = readt(db->fd, rply->name, rply->namelen, 0, ONE_DELAY)) != (ssize_t)rply->namelen) { LOG(log_error, logtype_cnid, "dbd_rpc: Error reading name from fd (db_dir %s): %s", db->db_dir, ret == -1?strerror(errno):"closed"); return -1; } - LOG(log_maxdebug, logtype_cnid, "dbd_rpc: END"); + LOG(log_maxdebug, logtype_cnid, "dbd_rpc: {done}"); return 0; } @@ -341,8 +361,6 @@ static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_db time_t orig, t; int clean = 1; /* no errors so far - to prevent sleep on first try */ - LOG(log_debug7, logtype_cnid, "transmit: BEGIN"); - if (db->changed) { /* volume and db don't have the same timestamp */ @@ -354,7 +372,7 @@ static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_db struct cnid_dbd_rply rply_stamp; char stamp[ADEDLEN_PRIVSYN]; - LOG(log_debug, logtype_cnid, "transmit: connecting to cnid_dbd ..."); + LOG(log_maxdebug, logtype_cnid, "transmit: connecting to cnid_dbd ..."); if ((db->fd = init_tsock(db)) < 0) { goto transmit_fail; } @@ -376,18 +394,17 @@ static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_db return -1; } LOG(log_debug7, logtype_cnid, "transmit: ... OK."); - } - else { + } else { /* db->notfirst == 0 */ db->notfirst = 1; if (db->client_stamp) memcpy(db->client_stamp, stamp, ADEDLEN_PRIVSYN); memcpy(db->stamp, stamp, ADEDLEN_PRIVSYN); } - LOG(log_debug, logtype_cnid, "transmit: succesfully attached to cnid_dbd for volume '%s' with stamp '%08lx'.", + LOG(log_debug, logtype_cnid, "transmit: attached to '%s', stamp: '%08lx'.", db->db_dir, *(uint64_t *)stamp); } if (!dbd_rpc(db, rqst, rply)) { - LOG(log_debug7, logtype_cnid, "transmit: END OK"); + LOG(log_maxdebug, logtype_cnid, "transmit: {done}"); return 0; } transmit_fail: @@ -396,6 +413,12 @@ static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_db db->fd = -1; /* FD not valid... will need to reconnect */ } + if (errno == ECONNREFUSED) { /* errno carefully injected in tsock_getfd */ + /* give up */ + LOG(log_error, logtype_cnid, "transmit: connection refused (db_dir %s)", db->db_dir); + return -1; + } + if (!clean) { /* don't sleep if just got disconnected by cnid server */ time(&t); if (t - orig > MAX_DELAY) { @@ -403,7 +426,7 @@ static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_db return -1; } /* sleep a little before retry */ - delay(5); + delay(1); } else { clean = 0; /* false... next time sleep */ time(&orig); @@ -442,16 +465,16 @@ static struct _cnid_db *cnid_dbd_new(const char *volpath) } /* ---------------------- */ -struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_, u_int32_t flags _U_) +struct _cnid_db *cnid_dbd_open(struct cnid_open_args *args) { CNID_private *db = NULL; struct _cnid_db *cdb = NULL; - if (!dir) { + if (!args->dir) { return NULL; } - if ((cdb = cnid_dbd_new(dir)) == NULL) { + if ((cdb = cnid_dbd_new(args->dir)) == NULL) { LOG(log_error, logtype_cnid, "cnid_open: Unable to allocate memory for database"); return NULL; } @@ -465,9 +488,11 @@ struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_, u_int32_t flags /* We keep a copy of the directory in the db structure so that we can transparently reconnect later. */ - strcpy(db->db_dir, dir); + strcpy(db->db_dir, args->dir); db->magic = CNID_DB_MAGIC; db->fd = -1; + db->cnidserver = strdup(args->cnidserver); + db->cnidport = strdup(args->cnidport); LOG(log_debug, logtype_cnid, "cnid_dbd_open: Finished initializing cnid dbd module for volume '%s'", db->db_dir); @@ -497,7 +522,7 @@ void cnid_dbd_close(struct _cnid_db *cdb) } if ((db = cdb->_private) != NULL) { - LOG(log_info, logtype_cnid, "closing database connection for volume '%s'", db->db_dir); + LOG(log_debug, logtype_cnid, "closing database connection for volume '%s'", db->db_dir); if (db->fd >= 0) close(db->fd); @@ -513,7 +538,7 @@ void cnid_dbd_close(struct _cnid_db *cdb) /* ---------------------- */ cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len, - cnid_t hint _U_) + cnid_t hint) { CNID_private *db; struct cnid_dbd_rqst rqst; @@ -541,6 +566,7 @@ cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st, rqst.ino = st->st_ino; rqst.type = S_ISDIR(st->st_mode)?1:0; + rqst.cnid = hint; rqst.did = did; rqst.name = name; rqst.namelen = len;