#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <string.h>
#include <sys/types.h>
#include <afs/procmgmt.h> /* signal(), kill(), wait(), etc. */
#include <sys/stat.h>
#include <netdb.h>
#include <unistd.h> /* sysconf() */
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
#ifndef ITIMER_REAL
#include <sys/time.h>
#endif /* ITIMER_REAL */
#include <afs/acl.h>
#include <afs/prs_fs.h>
#include <rx/rx.h>
-#include <rx/rxkad.h>
#include <afs/keys.h>
#include <afs/afs_args.h>
#include <afs/vlserver.h>
#ifndef AFS_NT40_ENV
#include <afs/netutils.h>
#endif
+#include "viced_prototypes.h"
#include "viced.h"
#include "host.h"
#ifdef AFS_PTHREAD_ENV
extern int LogLevel, etext;
extern afs_int32 BlocksSpare, PctSpare;
-int ShutDown(void);
+void *ShutDown(void *);
static void ClearXStatValues(), NewParms(), PrintCounters();
static void ResetCheckDescriptors(void), ResetCheckSignal(void);
-static int CheckSignal(void);
+static void *CheckSignal(void *);
extern int GetKeysFromToken();
extern int RXAFS_ExecuteRequest();
extern int RXSTATS_ExecuteRequest();
int restartMode = RESTART_ORDINARY;
-int Testing = 0; /* for ListViceInodes */
-
/*
* Home for the performance statistics.
*/
int SawPctSpare;
int debuglevel = 0;
int printBanner = 0;
-int rxJumbograms = 1; /* default is to send and receive jumbograms. */
+int rxJumbograms = 0; /* default is to not send and receive jumbograms. */
+int rxBind = 0; /* don't bind */
+int rxkadDisableDotCheck = 0; /* disable check for dot in principal name */
int rxMaxMTU = -1;
afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
* already implied */
int abort_threshold = 10;
int udpBufSize = 0; /* UDP buffer size for receive */
int sendBufSize = 16384; /* send buffer size */
+int saneacls = 0; /* Sane ACLs Flag */
struct timeval tp;
+#ifdef AFS_PTHREAD_ENV
+pthread_key_t viced_uclient_key;
+#endif
+
+#ifdef AFS_PTHREAD_ENV
+pthread_key_t viced_uclient_key;
+#endif
+
/*
* FileServer's name and IP address, both network byte order and
* host byte order.
* certain background threads before we are allowed to dump state to
* disk
*/
+
+#if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(AFS_DARWIN80_ENV)
+#define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
+#endif
+
struct fs_state fs_state =
{ FS_MODE_NORMAL,
0,
*/
/* DEBUG HACK */
-static int
-CheckDescriptors()
+static void *
+CheckDescriptors(void *unused)
{
#ifndef AFS_NT40_ENV
struct afs_stat status;
for (i = 0; i < tsize; i++) {
if (afs_fstat(i, &status) != -1) {
printf("%d: dev %x, inode %u, length %u, type/mode %x\n", i,
- status.st_dev, status.st_ino, status.st_size,
+ status.st_dev, status.st_ino,
+ (unsigned int) status.st_size,
status.st_mode);
}
}
fflush(stdout);
ResetCheckDescriptors();
- return 0;
#endif
+ return 0;
} /*CheckDescriptors */
void
CheckSignal_Signal(x)
{
- CheckSignal();
+ CheckSignal(NULL);
}
void
ShutDown_Signal(x)
{
- ShutDown();
+ ShutDown(NULL);
}
void
CheckDescriptors_Signal(x)
{
- CheckDescriptors();
+ CheckDescriptors(NULL);
}
#else /* AFS_PTHREAD_ENV */
void
}
/* This LWP does things roughly every 5 minutes */
-static void
-FiveMinuteCheckLWP()
+static void *
+FiveMinuteCheckLWP(void *unused)
{
static int msg = 0;
char tbuffer[32];
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*FiveMinuteCheckLWP */
* it probes the workstations
*/
-static void
-HostCheckLWP()
+static void *
+HostCheckLWP(void *unused)
{
ViceLog(1, ("Starting Host check process\n"));
setThreadId("HostCheckLWP");
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*HostCheckLWP */
/* This LWP does fsync checks every 5 minutes: it should not be used for
* other 5 minute activities because it may be delayed by timeouts when
* it probes the workstations
*/
-static void
-FsyncCheckLWP()
+static void *
+FsyncCheckLWP(void *unused)
{
afs_int32 code;
#ifdef AFS_PTHREAD_ENV
setThreadId("FsyncCheckLWP");
-#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_init(&fsync_cond, NULL) == 0);
- assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
-#endif
-
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
while (fs_state.mode == FS_MODE_NORMAL) {
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
+ return NULL;
}
/*------------------------------------------------------------------------
-static int
-CheckSignal()
+static void *
+CheckSignal(void *unused)
{
if (FS_registered > 0) {
/*
}
}
+ if (dopanic)
+ assert(0);
+
exit(0);
}
-int
-ShutDown(void)
+void *
+ShutDown(void *unused)
{ /* backward compatibility */
ShutDownAndCore(DONTPANIC);
return 0;
static void
FlagMsg()
{
- char buffer[2048];
-
/* default supports help flag */
- strcpy(buffer, "Usage: fileserver ");
- strcpy(buffer, "[-auditlog <log path>] ");
- strcat(buffer, "[-d <debug level>] ");
- strcat(buffer, "[-p <number of processes>] ");
- strcat(buffer, "[-spare <number of spare blocks>] ");
- strcat(buffer, "[-pctspare <percentage spare>] ");
- strcat(buffer, "[-b <buffers>] ");
- strcat(buffer, "[-l <large vnodes>] ");
- strcat(buffer, "[-s <small vnodes>] ");
- strcat(buffer, "[-vc <volume cachesize>] ");
- strcat(buffer, "[-w <call back wait interval>] ");
- strcat(buffer, "[-cb <number of call backs>] ");
- strcat(buffer, "[-banner (print banner every 10 minutes)] ");
- strcat(buffer, "[-novbc (whole volume cbs disabled)] ");
- strcat(buffer, "[-implicit <admin mode bits: rlidwka>] ");
- strcat(buffer, "[-readonly (read-only file server)] ");
- strcat(buffer,
- "[-hr <number of hours between refreshing the host cps>] ");
- strcat(buffer, "[-busyat <redirect clients when queue > n>] ");
- strcat(buffer, "[-nobusy <no VBUSY before a volume is attached>] ");
- strcat(buffer, "[-rxpck <number of rx extra packets>] ");
- strcat(buffer, "[-rxdbg (enable rx debugging)] ");
- strcat(buffer, "[-rxdbge (enable rxevent debugging)] ");
- strcat(buffer, "[-rxmaxmtu <bytes>] ");
+ fputs("Usage: fileserver ", stdout);
+ fputs("[-auditlog <log path>] ", stdout);
+ fputs("[-d <debug level>] ", stdout);
+ fputs("[-p <number of processes>] ", stdout);
+ fputs("[-spare <number of spare blocks>] ", stdout);
+ fputs("[-pctspare <percentage spare>] ", stdout);
+ fputs("[-b <buffers>] ", stdout);
+ fputs("[-l <large vnodes>] ", stdout);
+ fputs("[-s <small vnodes>] ", stdout);
+ fputs("[-vc <volume cachesize>] ", stdout);
+ fputs("[-w <call back wait interval>] ", stdout);
+ fputs("[-cb <number of call backs>] ", stdout);
+ fputs("[-banner (print banner every 10 minutes)] ", stdout);
+ fputs("[-novbc (whole volume cbs disabled)] ", stdout);
+ fputs("[-implicit <admin mode bits: rlidwka>] ", stdout);
+ fputs("[-readonly (read-only file server)] ", stdout);
+ fputs("[-hr <number of hours between refreshing the host cps>] ", stdout);
+ fputs("[-busyat <redirect clients when queue > n>] ", stdout);
+ fputs("[-nobusy <no VBUSY before a volume is attached>] ", stdout);
+ fputs("[-rxpck <number of rx extra packets>] ", stdout);
+ fputs("[-rxdbg (enable rx debugging)] ", stdout);
+ fputs("[-rxdbge (enable rxevent debugging)] ", stdout);
+ fputs("[-rxmaxmtu <bytes>] ", stdout);
+ fputs("[-rxbind (bind the Rx socket to one address)] ", stdout);
+ fputs("[-allow-dotted-principals (disable the rxkad principal name dot check)] ", stdout);
#ifdef AFS_DEMAND_ATTACH_FS
- strcat(buffer, "[-fs-state-dont-save (disable state save during shutdown)] ");
- strcat(buffer, "[-fs-state-dont-restore (disable state restore during startup)] ");
- strcat(buffer, "[-fs-state-verify <none|save|restore|both> (default is both)] ");
- strcat(buffer, "[-vattachpar <max number of volume attach/shutdown threads> (default is 1)] ");
- strcat(buffer, "[-vhashsize <log(2) of number of volume hash buckets> (default is 8)] ");
- strcat(buffer, "[-vlrudisable (disable VLRU functionality)] ");
- strcat(buffer, "[-vlruthresh <minutes before unused volumes become eligible for soft detach> (default is 2 hours)] ");
- strcat(buffer, "[-vlruinterval <seconds between VLRU scans> (default is 2 minutes)] ");
- strcat(buffer, "[-vlrumax <max volumes to soft detach in one VLRU scan> (default is 8)] ");
+ fputs("[-fs-state-dont-save (disable state save during shutdown)] ", stdout);
+ fputs("[-fs-state-dont-restore (disable state restore during startup)] ", stdout);
+ fputs("[-fs-state-verify <none|save|restore|both> (default is both)] ", stdout);
+ fputs("[-vattachpar <max number of volume attach/shutdown threads> (default is 1)] ", stdout);
+ fputs("[-vhashsize <log(2) of number of volume hash buckets> (default is 8)] ", stdout);
+ fputs("[-vlrudisable (disable VLRU functionality)] ", stdout);
+ fputs("[-vlruthresh <minutes before unused volumes become eligible for soft detach> (default is 2 hours)] ", stdout);
+ fputs("[-vlruinterval <seconds between VLRU scans> (default is 2 minutes)] ", stdout);
+ fputs("[-vlrumax <max volumes to soft detach in one VLRU scan> (default is 8)] ", stdout);
#elif AFS_PTHREAD_ENV
- strcat(buffer, "[-vattachpar <number of volume attach threads> (default is 1)] ");
+ fputs("[-vattachpar <number of volume attach threads> (default is 1)] ", stdout);
#endif
#ifdef AFS_AIX32_ENV
- strcat(buffer, "[-m <min percentage spare in partition>] ");
+ fputs("[-m <min percentage spare in partition>] ", stdout);
#endif
#if defined(AFS_SGI_ENV)
- strcat(buffer, "[-lock (keep fileserver from swapping)] ");
-#endif
- strcat(buffer, "[-L (large server conf)] ");
- strcat(buffer, "[-S (small server conf)] ");
- strcat(buffer, "[-k <stack size>] ");
- strcat(buffer, "[-realm <Kerberos realm name>] ");
- strcat(buffer, "[-udpsize <size of socket buffer in bytes>] ");
- strcat(buffer, "[-sendsize <size of send buffer in bytes>] ");
- strcat(buffer, "[-abortthreshold <abort threshold>] ");
-/* strcat(buffer, "[-enable_peer_stats] "); */
-/* strcat(buffer, "[-enable_process_stats] "); */
- strcat(buffer, "[-help]\n");
+ fputs("[-lock (keep fileserver from swapping)] ", stdout);
+#endif
+ fputs("[-L (large server conf)] ", stdout);
+ fputs("[-S (small server conf)] ", stdout);
+ fputs("[-k <stack size>] ", stdout);
+ fputs("[-realm <Kerberos realm name>] ", stdout);
+ fputs("[-udpsize <size of socket buffer in bytes>] ", stdout);
+ fputs("[-sendsize <size of send buffer in bytes>] ", stdout);
+ fputs("[-abortthreshold <abort threshold>] ", stdout);
+ fputs("[-nojumbo (disable jumbogram network packets - deprecated)] ", stdout);
+ fputs("[-jumbo (enable jumbogram network packets)] ", stdout);
+/* fputs("[-enable_peer_stats] ", stdout); */
+/* fputs("[-enable_process_stats] ", stdout); */
+ fputs("[-help]\n", stdout);
/*
ViceLog(0, ("%s", buffer));
*/
- printf("%s", buffer);
fflush(stdout);
} /*FlagMsg */
#endif
else if (!strcmp(argv[i], "-nojumbo")) {
rxJumbograms = 0;
+ } else if (!strcmp(argv[i], "-jumbo")) {
+ rxJumbograms = 1;
+ } else if (!strcmp(argv[i], "-rxbind")) {
+ rxBind = 1;
+ } else if (!strcmp(argv[i], "-allow-dotted-principals")) {
+ rxkadDisableDotCheck = 1;
} else if (!strcmp(argv[i], "-rxmaxmtu")) {
if ((i + 1) >= argc) {
fprintf(stderr, "missing argument for -rxmaxmtu\n");
/* set syslog logging flag */
mrafsStyleLogs = 1;
}
+ else if (strcmp(argv[i], "-saneacls") == 0) {
+ saneacls = 1;
+ }
else {
return (-1);
}
if (!Sawcbs)
numberofcbs = 64000;
if (!Sawlwps)
- lwps = 12;
+ lwps = 128;
if (!Sawbufs)
buffs = 120;
if (!SawVC)
("Couldn't initialize protection library; code=%d.\n", code));
return code;
}
+
+#ifdef AFS_PTHREAD_ENV
+ assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
+#endif
+
SystemId = SYSADMINID;
SystemAnyUser = ANYUSERID;
SystemAnyUserCPS.prlist_len = 0;
info.hostAddr[i].sin_port, USER_SERVICE_ID, sc,
scIndex);
code = ubik_ClientInit(serverconns, &cstruct);
+ afsconf_Close(tdir);
if (code) {
ViceLog(0, ("vl_Initialize: ubik client init failed.\n"));
return code;
AFSDIR_SERVER_SYSID_FILEPATH, nentries));
return EIO;
}
- FS_HostAddr_cnt = nentries;
- for (i = 0; i < nentries; i++) {
- if (read(fd, (char *)&FS_HostAddrs[i], sizeof(afs_int32)) !=
- sizeof(afs_int32)) {
- ViceLog(0,
- ("%s: Read of addresses failed (%d)\n",
- AFSDIR_SERVER_SYSID_FILEPATH, errno));
- FS_HostAddr_cnt = 0; /* reset it */
- return EIO;
+ if (FS_HostAddr_cnt == 0) {
+ FS_HostAddr_cnt = nentries;
+ for (i = 0; i < nentries; i++) {
+ if (read(fd, (char *)&FS_HostAddrs[i], sizeof(afs_int32)) !=
+ sizeof(afs_int32)) {
+ ViceLog(0,
+ ("%s: Read of addresses failed (%d)\n",
+ AFSDIR_SERVER_SYSID_FILEPATH, errno));
+ FS_HostAddr_cnt = 0; /* reset it */
+ return EIO;
+ }
}
+ } else {
+ ViceLog(1,
+ ("%s: address list ignored (NetInfo/NetRestrict override)\n",
+ AFSDIR_SERVER_SYSID_FILEPATH));
}
close(fd);
return 0;
FS_HostAddrs_HBO[i] = ntohl(FS_HostAddrs[i]);
addrs.bulkaddrs_len = FS_HostAddr_cnt;
addrs.bulkaddrs_val = (afs_uint32 *) FS_HostAddrs_HBO;
- code = ubik_Call(VL_RegisterAddrs, cstruct, 0, &FS_HostUUID, 0, &addrs);
+ code = ubik_VL_RegisterAddrs(cstruct, 0, &FS_HostUUID, 0, &addrs);
if (code) {
if (code == VL_MULTIPADDR) {
ViceLog(0,
}
afs_int32
+SetupVL()
+{
+ afs_int32 code;
+ extern int rxi_numNetAddrs;
+ extern afs_uint32 rxi_NetAddrs[];
+
+ if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
+ /*
+ * Find addresses we are supposed to register as per the netrestrict
+ * and netinfo files (/usr/afs/local/NetInfo and
+ * /usr/afs/local/NetRestict)
+ */
+ char reason[1024];
+ afs_int32 code = parseNetFiles(FS_HostAddrs, NULL, NULL,
+ ADDRSPERSITE, reason,
+ AFSDIR_SERVER_NETINFO_FILEPATH,
+ AFSDIR_SERVER_NETRESTRICT_FILEPATH);
+ if (code < 0) {
+ ViceLog(0, ("Can't register any valid addresses: %s\n", reason));
+ exit(1);
+ }
+ FS_HostAddr_cnt = (afs_uint32) code;
+ } else
+ {
+ FS_HostAddr_cnt = rx_getAllAddr(FS_HostAddrs, ADDRSPERSITE);
+ }
+
+ if (FS_HostAddr_cnt == 1 && rxBind == 1)
+ code = FS_HostAddrs[0];
+ else
+ code = htonl(INADDR_ANY);
+ return code;
+}
+
+afs_int32
InitVL()
{
afs_int32 code;
/* A good sysid file exists; inform the vlserver. If any conflicts,
* we always use the latest interface available as the real truth.
*/
-#ifndef AFS_NT40_ENV
- if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
- /*
- * Find addresses we are supposed to register as per the netrestrict
- * and netinfo files (/usr/afs/local/NetInfo and
- * /usr/afs/local/NetRestict)
- */
- char reason[1024];
- afs_int32 code = parseNetFiles(FS_HostAddrs, NULL, NULL,
- ADDRSPERSITE, reason,
- AFSDIR_SERVER_NETINFO_FILEPATH,
- AFSDIR_SERVER_NETRESTRICT_FILEPATH);
- if (code < 0) {
- ViceLog(0, ("Can't register any valid addresses: %s\n", reason));
- exit(1);
- }
- FS_HostAddr_cnt = (afs_uint32) code;
- } else
-#endif
- {
- FS_HostAddr_cnt = rx_getAllAddr(FS_HostAddrs, ADDRSPERSITE);
- }
- FS_registered = 1;
code = Do_VLRegisterRPC();
return code;
}
#endif
int curLimit;
time_t t;
+ afs_uint32 rx_bindhost;
#ifdef AFS_AIX32_ENV
struct sigaction nsa;
rx_SetBusyThreshold(busy_threshold, VBUSY);
rx_SetCallAbortThreshold(abort_threshold);
rx_SetConnAbortThreshold(abort_threshold);
+#ifdef AFS_XBSD_ENV
+ stackSize = 128 * 1024;
+#else
stackSize = lwps * 4000;
if (stackSize < 32000)
stackSize = 32000;
else if (stackSize > 44000)
stackSize = 44000;
-#if defined(AFS_HPUX_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SGI51_ENV)
+#endif
+#if defined(AFS_HPUX_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SGI51_ENV) || defined(AFS_XBSD_ENV)
rx_SetStackSize(1, stackSize);
#endif
if (udpBufSize)
rx_SetUdpBufSize(udpBufSize); /* set the UDP buffer size for receive */
- if (rx_Init((int)htons(7000)) < 0) {
+ rx_bindhost = SetupVL();
+
+ if (rx_InitHost(rx_bindhost, (int)htons(7000)) < 0) {
ViceLog(0, ("Cannot initialize RX\n"));
exit(1);
}
sc[1] = 0; /* rxvab_NewServerSecurityObject(key1, 0) */
sc[2] = rxkad_NewServerSecurityObject(rxkad_clear, NULL, get_key, NULL);
sc[3] = rxkad_NewServerSecurityObject(rxkad_crypt, NULL, get_key, NULL);
- tservice = rx_NewService( /* port */ 0, /* service id */ 1, /*service name */
- "AFS",
- /* security classes */ sc,
- /* numb sec classes */
- 4, RXAFS_ExecuteRequest);
+ tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
+ 1, /*service name */
+ "AFS",
+ /* security classes */ sc,
+ /* numb sec classes */
+ 4, RXAFS_ExecuteRequest);
if (!tservice) {
ViceLog(0,
("Failed to initialize RX, probably two servers running.\n"));
exit(-1);
}
- rx_SetDestroyConnProc(tservice, (void (*)())h_FreeConnection);
+ if (rxkadDisableDotCheck) {
+ rx_SetSecurityConfiguration(tservice, RXS_CONFIG_FLAGS,
+ (void *)RXS_CONFIG_FLAGS_DISABLE_DOTCHECK);
+ }
rx_SetMinProcs(tservice, 3);
rx_SetMaxProcs(tservice, lwps);
rx_SetCheckReach(tservice, 1);
+ rx_SetServerIdleDeadErr(tservice, VNOSERVICE);
tservice =
rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", sc, 4,
/* allow super users to manage RX statistics */
rx_SetRxStatUserOk(fs_rxstat_userok);
+#ifdef AFS_PTHREAD_ENV
+ assert(pthread_cond_init(&fsync_cond, NULL) == 0);
+ assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
+#endif
+
+#if !defined(AFS_DEMAND_ATTACH_FS)
+ /*
+ * For DAFS, we do not start the Rx server threads until after
+ * the volume package is initialized, and fileserver state is
+ * restored. This is necessary in order to keep host and callback
+ * package state pristine until we have a chance to restore state.
+ *
+ * Furthermore, startup latency is much lower with dafs, so this
+ * shouldn't pose a serious problem.
+ */
rx_StartServer(0); /* now start handling requests */
+#endif
/* we ensure that there is enough space in the vnode buffer to satisfy
** requests from all concurrent threads.
* restore fileserver state */
fs_stateRestore();
}
+ rx_StartServer(0); /* now start handling requests */
#endif /* AFS_DEMAND_ATTACH_FS */
/*
#ifdef AFS_PTHREAD_ENV
ViceLog(5, ("Starting pthreads\n"));
+#ifdef AFS_DEMAND_ATTACH_FS
+ FS_STATE_INIT;
+#endif
assert(pthread_attr_init(&tattr) == 0);
assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FiveMinuteCheckLWP,
+ (&serverPid, &tattr, FiveMinuteCheckLWP,
&fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)HostCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FsyncCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
#else /* AFS_PTHREAD_ENV */
ViceLog(5, ("Starting LWP\n"));
assert(LWP_CreateProcess
#else /* AFS_PTHREAD_ENV */
assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
+ return 0;
}
git://git.openafs.org / openafs.git / blobdiff