#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
#include <stdio.h>
#include <stdlib.h>
#include <afs/acl.h>
#include <afs/prs_fs.h>
#include <rx/rx.h>
+#include <rx/rxstat.h>
#include <afs/keys.h>
#include <afs/afs_args.h>
#include <afs/vlserver.h>
#include <afs/ptuser.h>
#include <afs/audit.h>
#include <afs/partition.h>
+#include <afs/dir.h>
#ifndef AFS_NT40_ENV
#include <afs/netutils.h>
#endif
#include "viced.h"
#include "host.h"
#ifdef AFS_PTHREAD_ENV
-#include "softsig.h"
+#include <afs/softsig.h>
#endif
#if defined(AFS_SGI_ENV)
#include "sys/schedctl.h"
#define afs_fopen fopen
#endif /* !O_LARGEFILE */
-extern int BreakVolumeCallBacks(), InitCallBack();
-extern int BreakVolumeCallBacks(), InitCallBack(), BreakLaterCallBacks();
-extern int BreakVolumeCallBacksLater();
-extern int LogLevel, etext;
-extern afs_int32 BlocksSpare, PctSpare;
+extern int etext;
void *ShutDown(void *);
-static void ClearXStatValues(), NewParms(), PrintCounters();
-static void ResetCheckDescriptors(void), ResetCheckSignal(void);
+static void ClearXStatValues(void);
+static void NewParms(int);
+static void PrintCounters(void);
+static void ResetCheckDescriptors(void);
+static void ResetCheckSignal(void);
static void *CheckSignal(void *);
-extern int GetKeysFromToken();
-extern int RXAFS_ExecuteRequest();
-extern int RXSTATS_ExecuteRequest();
-afs_int32 Do_VLRegisterRPC();
+
+static afs_int32 Do_VLRegisterRPC(void);
int eventlog = 0, rxlog = 0;
FILE *debugFile;
#endif
time_t StartTime;
+/**
+ * seconds to wait until forcing a panic during ShutDownAndCore(PANIC)
+ * in case we get stuck.
+ */
+#ifdef AFS_DEMAND_ATTACH_FS
+static int panic_timeout = 2 * 60;
+#else
+static int panic_timeout = 30 * 60;
+#endif
+
int rxpackets = 150; /* 100 */
int nSmallVns = 400; /* 200 */
int large = 400; /* 200 */
/* All addresses in FS_HostAddrs are in NBO */
afsUUID FS_HostUUID;
-static void FlagMsg();
+static void FlagMsg(void);
#ifdef AFS_DEMAND_ATTACH_FS
/*
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,
+ (unsigned int) status.st_dev,
+ (unsigned int) status.st_ino,
(unsigned int) status.st_size,
status.st_mode);
}
#ifdef AFS_PTHREAD_ENV
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
CheckSignal(NULL);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
ShutDown(NULL);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
CheckDescriptors(NULL);
}
#else /* AFS_PTHREAD_ENV */
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
IOMGR_SoftSig(CheckSignal, 0);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
IOMGR_SoftSig(ShutDown, 0);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
IOMGR_SoftSig(CheckDescriptors, 0);
}
int
threadNum(void)
{
- return pthread_getspecific(rx_thread_id_key);
+ return (intptr_t)pthread_getspecific(rx_thread_id_key);
}
#endif
-/* proc called by rxkad module to get a key */
-static int
-get_key(void *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
-{
- /* find the key */
- static struct afsconf_key tkey;
- register afs_int32 code;
-
- if (!confDir) {
- ViceLog(0, ("conf dir not open\n"));
- return 1;
- }
- code = afsconf_GetKey(confDir, akvno, (struct ktc_encryptionKey *)tkey.key);
- if (code) {
- ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
- return code;
- }
- memcpy(akey, tkey.key, sizeof(tkey.key));
- return 0;
-
-} /*get_key */
-
#ifndef AFS_NT40_ENV
int
viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
afs_uint32 rcode;
- void (*old) ();
-
#ifndef AFS_LINUX20_ENV
- old = (void (*)())signal(SIGSYS, SIG_IGN);
+ void (*old) (int);
+
+ old = (void (*)(int))signal(SIGSYS, SIG_IGN);
#endif
rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
#ifndef AFS_LINUX20_ENV
char adminName[MAXADMINNAME];
static void
-CheckAdminName()
+CheckAdminName(void)
{
int fd = 0;
struct afs_stat status;
/* set our 'thread-id' so that the host hold table works */
MUTEX_ENTER(&rx_stats_mutex); /* protects rxi_pthread_hinum */
++rxi_pthread_hinum;
- pthread_setspecific(rx_thread_id_key, (void *)rxi_pthread_hinum);
+ pthread_setspecific(rx_thread_id_key, (void *)(intptr_t)rxi_pthread_hinum);
MUTEX_EXIT(&rx_stats_mutex);
ViceLog(0,
- ("Set thread id %d for '%s'\n",
+ ("Set thread id %p for '%s'\n",
pthread_getspecific(rx_thread_id_key), s));
#endif
}
*------------------------------------------------------------------------*/
static void
-ClearXStatValues()
+ClearXStatValues(void)
{ /*ClearXStatValues */
struct fs_stats_opTimingData *opTimeP; /*Ptr to timing struct */
/*
* Zero all xstat-related structures.
*/
- memset((char *)(&afs_perfstats), 0, sizeof(struct afs_PerfStats));
+ memset((&afs_perfstats), 0, sizeof(struct afs_PerfStats));
#if FS_STATS_DETAILED
- memset((char *)(&afs_FullPerfStats), 0,
+ memset((&afs_FullPerfStats), 0,
sizeof(struct fs_stats_FullPerfStats));
/*
afs_fsize_t CopyOnWrite_maxsize = 0;
static void
-PrintCounters()
+PrintCounters(void)
{
int dirbuff, dircall, dirio;
struct timeval tpl;
("With %d directory buffers; %d reads resulted in %d read I/Os\n",
dirbuff, dircall, dirio));
rx_PrintStats(stderr);
+ audit_PrintStats(stderr);
h_PrintStats();
PrintCallBackStats();
#ifdef AFS_NT40_ENV
return 0;
} /*CheckSignal */
+static void *
+ShutdownWatchdogLWP(void *unused)
+{
+ sleep(panic_timeout);
+ ViceLog(0, ("ShutdownWatchdogLWP: Failed to shutdown and panic "
+ "within %d seconds; forcing panic\n", panic_timeout));
+ assert(0);
+ return NULL;
+}
+
void
ShutDownAndCore(int dopanic)
{
time_t now = time(0);
char tbuffer[32];
+ if (dopanic) {
+#ifdef AFS_PTHREAD_ENV
+ pthread_t watchdogPid;
+ pthread_attr_t tattr;
+ assert(pthread_attr_init(&tattr) == 0);
+ assert(pthread_create(&watchdogPid, &tattr, ShutdownWatchdogLWP, NULL) == 0);
+#else
+ PROCESS watchdogPid;
+ assert(LWP_CreateProcess
+ (ShutdownWatchdogLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
+ NULL, "ShutdownWatchdog", &watchdogPid) == LWP_SUCCESS);
+#endif
+ }
+
/* do not allows new reqests to be served from now on, all new requests
* are returned with an error code of RX_RESTARTING ( transient failure ) */
rx_SetRxTranquil(); /* dhruba */
+ VSetTranquil();
+
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
fs_state.mode = FS_MODE_SHUTDOWN;
* demand attach fs
* save fileserver state to disk */
- /* make sure background threads have finished all of their asynchronous
- * work on host and callback structures */
- FS_STATE_RDLOCK;
- while (!fs_state.FiveMinuteLWP_tranquil ||
- !fs_state.HostCheckLWP_tranquil ||
- !fs_state.FsyncCheckLWP_tranquil) {
- FS_LOCK;
- FS_STATE_UNLOCK;
- ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
- assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
- FS_UNLOCK;
+ if (dopanic) {
+ ViceLog(0, ("Not saving fileserver state; abnormal shutdown\n"));
+
+ } else {
+ /* make sure background threads have finished all of their asynchronous
+ * work on host and callback structures */
FS_STATE_RDLOCK;
- }
+ while (!fs_state.FiveMinuteLWP_tranquil ||
+ !fs_state.HostCheckLWP_tranquil ||
+ !fs_state.FsyncCheckLWP_tranquil) {
+ FS_LOCK;
+ FS_STATE_UNLOCK;
+ ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
+ assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
+ FS_UNLOCK;
+ FS_STATE_RDLOCK;
+ }
- /* ok. it should now be fairly safe. let's do the state dump */
- fs_stateSave();
+ /* ok. it should now be fairly safe. let's do the state dump */
+ fs_stateSave();
+ }
}
#endif /* AFS_DEMAND_ATTACH_FS */
static void
-FlagMsg()
+FlagMsg(void)
{
/* default supports help flag */
fputs("Usage: fileserver ", stdout);
fputs("[-auditlog <log path>] ", stdout);
+ fputs("[-audit-interface <file|sysvmq> (default is file)] ", stdout);
fputs("[-d <debug level>] ", stdout);
fputs("[-p <number of processes>] ", stdout);
fputs("[-spare <number of spare blocks>] ", 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);
+ fputs("[-vhandle-setaside (fds reserved for non-cache io [default 128])] ", stdout);
+ fputs("[-vhandle-max-cachesize (max open files [default 128])] ", stdout);
+ fputs("[-vhandle-initial-cachesize (fds reserved for cache io [default 128])] ", stdout);
#ifdef AFS_DEMAND_ATTACH_FS
fputs("[-fs-state-dont-save (disable state save during shutdown)] ", stdout);
fputs("[-fs-state-dont-restore (disable state restore during startup)] ", stdout);
return MAX_FILESERVER_THREAD;
}
+/* from ihandle.c */
+extern ih_init_params vol_io_params;
+
static int
ParseArgs(int argc, char *argv[])
{
int Sawbusy = 0;
int i;
int bufSize = 0; /* temp variable to read in udp socket buf size */
+ char *auditFileName = NULL;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-d")) {
}
vol_attach_threads = atoi(argv[++i]);
#endif /* AFS_PTHREAD_ENV */
+ } else if (!strcmp(argv[i], "-vhandle-setaside")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_handle_setaside = atoi(argv[++i]);
+ } else if (!strcmp(argv[i], "-vhandle-max-cachesize")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_max_cachesize = atoi(argv[++i]);
+ } else if (!strcmp(argv[i], "-vhandle-initial-cachesize")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_initial_cachesize = atoi(argv[++i]);
#ifdef AFS_DEMAND_ATTACH_FS
} else if (!strcmp(argv[i], "-fs-state-dont-save")) {
fs_state.options.fs_state_save = 0;
rxMaxMTU = atoi(argv[++i]);
if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
(rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
- printf("rxMaxMTU %d%% invalid; must be between %d-%d\n",
+ printf("rxMaxMTU %d%% invalid; must be between %d-%" AFS_SIZET_FMT "\n",
rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
rx_enableProcessRPCStats();
}
else if (strcmp(argv[i], "-auditlog") == 0) {
- char *fileName = argv[++i];
+ auditFileName = argv[++i];
+ }
+ else if (strcmp(argv[i], "-audit-interface") == 0) {
+ char *interface = argv[++i];
- osi_audit_file(fileName);
+ if (osi_audit_interface(interface)) {
+ printf("Invalid audit interface '%s'\n", interface);
+ return -1;
+ }
}
#ifndef AFS_NT40_ENV
else if (strcmp(argv[i], "-syslog") == 0) {
}
if (!Sawbusy)
busy_threshold = 3 * rxpackets / 2;
+ if (auditFileName)
+ osi_audit_file(auditFileName);
return (0);
ViceLog(0, ("Read on parms failed with errno = %d\n", errno));
} else {
ViceLog(0,
- ("Read on parms failed; expected %d bytes but read %d\n",
- sbuf.st_size, i));
+ ("Read on parms failed; expected %ld bytes but read %d\n",
+ (long) sbuf.st_size, i));
}
free(parms);
return;
afs_int32
-InitPR()
+InitPR(void)
{
int code;
afs_int32
vl_Initialize(const char *confDir)
{
- afs_int32 code, scIndex = 0, i;
+ afs_int32 code, i;
+ afs_int32 scIndex = RX_SECIDX_NULL;
struct afsconf_dir *tdir;
struct rx_securityClass *sc;
struct afsconf_cell info;
#define SYSIDVERSION 1
afs_int32
-ReadSysIdFile()
+ReadSysIdFile(void)
{
afs_int32 fd, nentries, i;
struct versionStamp vsn;
}
afs_int32
-WriteSysIdFile()
+WriteSysIdFile(void)
{
afs_int32 fd, i;
struct versionStamp vsn;
* and so we need to convert each of them into HBO which is what the extra
* array called FS_HostAddrs_HBO is used here.
*/
-afs_int32
-Do_VLRegisterRPC()
+static afs_int32
+Do_VLRegisterRPC(void)
{
register int code;
bulkaddrs addrs;
- extern int VL_RegisterAddrs();
afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
int i = 0;
ViceLog(0,
("VL_RegisterAddrs rpc failed; will retry periodically (code=%d, err=%d)\n",
code, errno));
+ FS_registered = 1; /* Retry in the gc daemon */
}
} else {
FS_registered = 2; /* So we don't have to retry in the gc daemon */
}
afs_int32
-SetupVL()
+SetupVL(void)
{
afs_int32 code;
- extern int rxi_numNetAddrs;
- extern afs_uint32 rxi_NetAddrs[];
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
/*
}
afs_int32
-InitVL()
+InitVL(void)
{
afs_int32 code;
{
afs_int32 code;
char tbuffer[32];
- struct rx_securityClass *sc[4];
+ struct rx_securityClass **securityClasses;
+ afs_int32 numClasses;
struct rx_service *tservice;
#ifdef AFS_PTHREAD_ENV
pthread_t serverPid;
int curLimit;
time_t t;
afs_uint32 rx_bindhost;
+ VolumePackageOptions opts;
#ifdef AFS_AIX32_ENV
struct sigaction nsa;
#ifndef AFS_QUIETFS_ENV
console = afs_fopen("/dev/console", "w");
#endif
+ /* set ihandle package defaults prior to parsing args */
+ ih_PkgDefaults();
if (ParseArgs(argc, argv)) {
FlagMsg();
#endif
#endif
assert(DInit(buffs) == 0);
+#ifdef AFS_DEMAND_ATTACH_FS
+ FS_STATE_INIT;
+#endif
#ifdef AFS_NT40_ENV
if (afs_winsockInit() < 0) {
lwps = curLimit;
else if (lwps > 16)
lwps = 16; /* default to a maximum of 16 threads */
+
+ /* tune the ihandle fd cache accordingly */
+ if (vol_io_params.fd_max_cachesize < curLimit)
+ vol_io_params.fd_max_cachesize = curLimit + 1;
+
ViceLog(0,
- ("The system supports a max of %d open files and we are starting %d threads\n",
- curLimit, lwps));
+ ("The system supports a max of %d open files and we are starting %d threads (ihandle fd cache is %d)\n",
+ curLimit, lwps, vol_io_params.fd_max_cachesize));
}
#ifndef AFS_PTHREAD_ENV
assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
}
rx_GetIFInfo();
rx_SetRxDeadTime(30);
- sc[0] = rxnull_NewServerSecurityObject();
- 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);
+ afsconf_BuildServerSecurityObjects(confDir, AFSCONF_SEC_OBJS_RXKAD_CRYPT,
+ &securityClasses, &numClasses);
+
tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
1, /*service name */
"AFS",
- /* security classes */ sc,
- /* numb sec classes */
- 4, RXAFS_ExecuteRequest);
+ securityClasses, numClasses,
+ RXAFS_ExecuteRequest);
if (!tservice) {
ViceLog(0,
("Failed to initialize RX, probably two servers running.\n"));
rx_SetServerIdleDeadErr(tservice, VNOSERVICE);
tservice =
- rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", sc, 4,
- RXSTATS_ExecuteRequest);
+ rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", securityClasses,
+ numClasses, RXSTATS_ExecuteRequest);
if (!tservice) {
ViceLog(0, ("Failed to initialize rpc stat service.\n"));
exit(-1);
ClearXStatValues();
code = InitVL();
- if (code) {
+ if (code && code != VL_MULTIPADDR) {
ViceLog(0, ("Fatal error in library initialization, exiting!!\n"));
exit(1);
}
code = InitPR();
- if (code) {
+ if (code && code != -1) {
ViceLog(0, ("Fatal error in protection initialization, exiting!!\n"));
exit(1);
}
* will be available "real soon now". Worry about whether we can satisfy the
* calls in the volume package itself.
*/
- if (VInitVolumePackage(fileServer, large, nSmallVns, 0, volcache)) {
+ VOptDefaults(fileServer, &opts);
+ opts.nLargeVnodes = large;
+ opts.nSmallVnodes = nSmallVns;
+ opts.volcache = volcache;
+
+ if (VInitVolumePackage2(fileServer, &opts)) {
+ ViceLog(0,
+ ("Shutting down: errors encountered initializing volume package\n"));
+ VShutdown();
+ exit(1);
+ }
+
+ /* Install handler to catch the shutdown signal;
+ * bosserver assumes SIGQUIT shutdown
+ */
+#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+ softsig_signal(SIGQUIT, ShutDown_Signal);
+#else
+ (void)signal(SIGQUIT, ShutDown_Signal);
+#endif
+
+ if (VInitAttachVolumes(fileServer)) {
ViceLog(0,
("Shutting down: errors encountered initializing volume package\n"));
VShutdown();
#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);
FS_HostName, hoststr, FS_HostAddr_NBO, FS_HostAddr_HBO));
}
- /* Install handler to catch the shutdown signal;
- * bosserver assumes SIGQUIT shutdown
- */
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
- softsig_signal(SIGQUIT, ShutDown_Signal);
-#else
- (void)signal(SIGQUIT, ShutDown_Signal);
-#endif
-
t = tp.tv_sec;
ViceLog(0,
("File Server started %s",
git://git.openafs.org / openafs.git / blobdiff