/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
+#include <afs/procmgmt.h>
+#include <roken.h>
-#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 <fcntl.h>
#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <windows.h>
-#include <WINNT/afsevent.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <unistd.h> /* sysconf() */
-
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
-#include <sys/resource.h>
-#endif /* AFS_NT40_ENV */
-#include <afs/stds.h>
+# include <windows.h>
+# include <WINNT/afsevent.h>
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#undef SHARED
+
#include <rx/xdr.h>
#include <afs/nfs.h>
-#ifdef AFS_PTHREAD_ENV
-#include <assert.h>
-#else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
-#endif /* AFS_PTHREAD_ENV */
+#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/ptclient.h>
#include <afs/partition.h>
#include <afs/dir.h>
#ifndef AFS_NT40_ENV
-#include <afs/netutils.h>
+# include <afs/netutils.h>
#endif
#include "viced_prototypes.h"
#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"
-#include "sys/lock.h"
+# include "sys/schedctl.h"
+# include "sys/lock.h"
#endif
#include <rx/rx_globals.h>
-#ifdef O_LARGEFILE
-#define afs_stat stat64
-#define afs_fstat fstat64
-#define afs_open open64
-#define afs_fopen fopen64
-#else /* !O_LARGEFILE */
-#define afs_stat stat
-#define afs_fstat fstat
-#define afs_open open
-#define afs_fopen fopen
-#endif /* !O_LARGEFILE */
-
extern int etext;
void *ShutDown(void *);
static void ClearXStatValues(void);
-static void NewParms(int);
static void PrintCounters(void);
static void ResetCheckDescriptors(void);
static void ResetCheckSignal(void);
int eventlog = 0, rxlog = 0;
FILE *debugFile;
-FILE *console = NULL;
#ifdef AFS_PTHREAD_ENV
pthread_mutex_t fsync_glock_mutex;
#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_NT40_ENV
-#define AFS_QUIETFS_ENV 1
-#define NT_OPEN_MAX 1024 /* This is an arbitrary no. we came up with for
+# define NT_OPEN_MAX 1024 /* This is an arbitrary no. we came up with for
* now. We hope this will be replaced by a more
* intelligent estimate later. */
#endif
int printBanner = 0;
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 rxkadDisableDotCheck = 0; /* disable check for dot in principal name */
int rxMaxMTU = -1;
-afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
+afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
* already implied */
afs_int32 readonlyServer = 0;
#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 */
int udpBufSize = 0; /* UDP buffer size for receive */
int sendBufSize = 16384; /* send buffer size */
int saneacls = 0; /* Sane ACLs Flag */
+static int unsafe_attach = 0; /* avoid inUse check on vol attach? */
+static int offline_timeout = -1; /* -offline-timeout option */
+static int offline_shutdown_timeout = -1; /* -offline-shutdown-timeout option */
struct timeval tp;
* disk
*/
-#if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(AFS_DARWIN80_ENV)
-#define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
-#endif
+# 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,
- 0,
- 0,
+# ifndef AFS_NT40_ENV
+struct fs_state fs_state =
+ { FS_MODE_NORMAL,
+ 0,
+ 0,
+ 0,
0,
{ 1,1,1,1 },
PTHREAD_COND_INITIALIZER,
PTHREAD_RWLOCK_INITIALIZER
};
+# else /* AFS_NT40_ENV */
+struct fs_state fs_state;
+
+static int fs_stateInit(void)
+{
+ fs_state.mode = FS_MODE_NORMAL;
+ fs_state.FiveMinuteLWP_tranquil = 0;
+ fs_state.HostCheckLWP_tranquil = 0;
+ fs_state.FsyncCheckLWP_tranquil = 0;
+ fs_state.salvsync_fatal_error = 0;
+
+ fs_state.options.fs_state_save = 1;
+ fs_state.options.fs_state_restore = 1;
+ fs_state.options.fs_state_verify_before_save = 1;
+ fs_state.options.fs_state_verify_after_restore = 1;
+
+ CV_INIT(&fs_state.worker_done_cv, "worker done", CV_DEFAULT, 0);
+ osi_Assert(pthread_rwlock_init(&fs_state.state_lock, NULL) == 0);
+}
+# endif /* AFS_NT40_ENV */
#endif /* AFS_DEMAND_ATTACH_FS */
/*
{
#ifndef AFS_NT40_ENV
struct afs_stat status;
- register int tsize = getdtablesize();
- register int i;
+ int tsize = getdtablesize();
+ int i;
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,
#if defined(AFS_HPUX_ENV)
signo = SIGPOLL;
-#else
-#if defined(AFS_NT40_ENV)
+#elif defined(AFS_NT40_ENV)
signo = SIGUSR2;
#else
signo = SIGXCPU;
#endif
-#endif
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
softsig_signal(signo, CheckSignal_Signal);
ResetCheckDescriptors(void)
{
#ifndef AFS_NT40_ENV
-#if defined(AFS_PTHREAD_ENV)
+# if defined(AFS_PTHREAD_ENV)
softsig_signal(SIGTERM, CheckDescriptors_Signal);
-#else
+# else
(void)signal(SIGTERM, CheckDescriptors_Signal);
-#endif
+# endif
#endif
}
}
#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;
-#ifndef AFS_LINUX20_ENV
+# ifndef AFS_LINUX20_ENV
void (*old) (int);
old = (void (*)(int))signal(SIGSYS, SIG_IGN);
-#endif
+# endif
rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
-#ifndef AFS_LINUX20_ENV
+# ifndef AFS_LINUX20_ENV
signal(SIGSYS, old);
-#endif
+# endif
return rcode;
}
#endif
#if !defined(AFS_NT40_ENV)
-#include "AFS_component_version_number.c"
+# include "AFS_component_version_number.c"
#endif /* !AFS_NT40_ENV */
#define MAXADMINNAME 64
{
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
/* 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 *)(intptr_t)rxi_pthread_hinum);
- MUTEX_EXIT(&rx_stats_mutex);
+ pthread_setspecific(rx_thread_id_key,
+ (void *)(intptr_t)rx_NewThreadId());
+ afs_pthread_setname_self(s);
ViceLog(0,
- ("Set thread id %d for '%s'\n",
+ ("Set thread id %p for '%s'\n",
pthread_getspecific(rx_thread_id_key), s));
#endif
}
#endif
if (printBanner && (++msg & 1)) { /* Every 10 minutes */
time_t now = FT_ApproxTime();
- if (console != NULL) {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server is running at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif /* AFS_QUIETFS_ENV */
- ViceLog(2,
- ("File server is running at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- }
+ struct tm tm;
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
+ ViceLog(2,
+ ("File server is running at %s\n", tbuffer));
}
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FiveMinuteLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.HostCheckLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
fsync_next.tv_nsec = 0;
fsync_next.tv_sec = time(0) + fiveminutes;
- code =
- pthread_cond_timedwait(&fsync_cond, &fsync_glock_mutex,
- &fsync_next);
+ code = CV_TIMEDWAIT(&fsync_cond, &fsync_glock_mutex,
+ &fsync_next);
if (code != 0 && code != ETIMEDOUT)
ViceLog(0, ("pthread_cond_timedwait returned %d\n", code));
#else /* AFS_PTHREAD_ENV */
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FsyncCheckLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
* declared in param.h. If such a thing is not defined, we bitch
* and declare ourselves to be an unknown system type.
*/
-#ifdef SYS_NAME_ID
+# ifdef SYS_NAME_ID
afs_perfstats.sysname_ID = SYS_NAME_ID;
-#else
-#ifndef AFS_NT40_ENV
+# else
+# ifndef AFS_NT40_ENV
ViceLog(0, ("Sys name ID constant not defined in param.h!!\n"));
ViceLog(0, ("[Choosing ``undefined'' sys name ID.\n"));
-#endif
+# endif
afs_perfstats.sysname_ID = SYS_NAME_ID_UNDEFINED;
-#endif /* SYS_NAME_ID */
+# endif /* SYS_NAME_ID */
#endif
} /*ClearXStatValues */
int workstations, activeworkstations, delworkstations;
int processSize = 0;
char tbuffer[32];
+ struct tm tm;
+#ifdef AFS_DEMAND_ATTACH_FS
+ int stats_flags = 0;
+#endif
FT_GetTimeOfDay(&tpl, 0);
Statistics = 1;
- ViceLog(0,
- ("Vice was last started at %s\n",
- afs_ctime(&StartTime, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&StartTime, &tm));
+ ViceLog(0, ("Vice was last started at %s\n", tbuffer));
#ifdef AFS_DEMAND_ATTACH_FS
- /* XXX perhaps set extended stats verbosity flags
- * based upon LogLevel ?? */
- VPrintExtendedCacheStats(VOL_STATS_PER_CHAIN2);
+ if (LogLevel >= 125) {
+ stats_flags = VOL_STATS_PER_CHAIN2;
+ } else if (LogLevel >= 25) {
+ stats_flags = VOL_STATS_PER_CHAIN;
+ }
+ VPrintExtendedCacheStats(stats_flags);
#endif
VPrintCacheStats();
VPrintDiskStats();
return 0;
} /*CheckSignal */
+static void *
+ShutdownWatchdogLWP(void *unused)
+{
+ sleep(panic_timeout);
+ ViceLogThenPanic(0, ("ShutdownWatchdogLWP: Failed to shutdown and panic "
+ "within %d seconds; forcing panic\n",
+ panic_timeout));
+ return NULL;
+}
+
void
ShutDownAndCore(int dopanic)
{
- time_t now = time(0);
+ time_t now = time(NULL);
+ struct tm tm;
char tbuffer[32];
+ if (dopanic) {
+#ifdef AFS_PTHREAD_ENV
+ pthread_t watchdogPid;
+ pthread_attr_t tattr;
+ osi_Assert(pthread_attr_init(&tattr) == 0);
+ osi_Assert(pthread_create(&watchdogPid, &tattr, ShutdownWatchdogLWP, NULL) == 0);
+#else
+ PROCESS watchdogPid;
+ osi_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;
+ if (fs_state.mode == FS_MODE_SHUTDOWN) {
+ /* it is possible for at least fs_stateSave() (called below) to call
+ * ShutDownAndCore if there's host list corruption; prevent
+ * deinitializing some stuff twice */
+ ViceLog(0, ("ShutDownAndCore called during shutdown? Skipping volume "
+ "and host package shutdown\n"));
+ FS_STATE_UNLOCK;
+ goto done_vol_host;
+ }
fs_state.mode = FS_MODE_SHUTDOWN;
FS_STATE_UNLOCK;
#endif
- ViceLog(0,
- ("Shutting down file server at %s",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
+ ViceLog(0, ("Shutting down file server at %s\n", tbuffer));
if (dopanic)
ViceLog(0, ("ABNORMAL SHUTDOWN, see core file.\n"));
-#ifndef AFS_QUIETFS_ENV
- if (console != NULL) {
- fprintf(console, "File server restart/shutdown received at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
- }
-#endif
DFlush();
if (!dopanic)
PrintCounters();
#ifdef AFS_DEMAND_ATTACH_FS
if (fs_state.options.fs_state_save) {
- /*
+ /*
* 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"));
+ CV_WAIT(&fs_state.worker_done_cv, &fileproc_glock_mutex);
+ FS_UNLOCK;
+ FS_STATE_RDLOCK;
+ }
+ FS_STATE_UNLOCK;
- /* 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();
+ }
}
+ done_vol_host:
+
#endif /* AFS_DEMAND_ATTACH_FS */
if (debugFile) {
rx_PrintStats(debugFile);
fflush(debugFile);
}
- if (console != NULL) {
- now = time(0);
- if (dopanic) {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server has terminated abnormally at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif
- ViceLog(0,
- ("File server has terminated abnormally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- } else {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server has terminated normally at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif
- ViceLog(0,
- ("File server has terminated normally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- }
+ now = time(0);
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
+ if (dopanic) {
+ ViceLog(0, ("File server has terminated abnormally at %s\n", tbuffer));
+ } else {
+ ViceLog(0, ("File server has terminated normally at %s\n", tbuffer));
}
- if (dopanic)
- assert(0);
+ if (dopanic) /* XXX pass in file and line? */
+ osi_Panic("Panic requested\n");
exit(0);
}
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);
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);
+ fputs("[-unsafe-nosalvage (bypass volume inUse safety check on attach, bypassing salvage)] ", stdout);
#elif AFS_PTHREAD_ENV
fputs("[-vattachpar <number of volume attach threads> (default is 1)] ", stdout);
#endif
fputs("[-abortthreshold <abort threshold>] ", stdout);
fputs("[-nojumbo (disable jumbogram network packets - deprecated)] ", stdout);
fputs("[-jumbo (enable jumbogram network packets)] ", stdout);
+ fputs("[-offline-timeout <client RX timeout for offlining volumes>]", stdout);
+ fputs("[-offline-shutdown-timeout <RX timeout for offlining volumes during shutdown>]", stdout);
/* fputs("[-enable_peer_stats] ", stdout); */
/* fputs("[-enable_process_stats] ", stdout); */
fputs("[-help]\n", stdout);
static int
max_fileserver_thread(void)
{
-#if defined(AFS_PTHREAD_ENV)
-#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV)
+#if defined(AFS_PTHREAD_ENV) && (defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV))
long ans;
ans = sysconf(_SC_THREAD_THREADS_MAX);
if (0 < ans && ans < MAX_FILESERVER_THREAD)
return (int)ans;
-#endif
#endif /* defined(AFS_PTHREAD_ENV) */
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 */
+ int lwps_max;
char *auditFileName = NULL;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-d")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -d\n");
- return -1;
+ fprintf(stderr, "missing argument for -d\n");
+ return -1;
}
debuglevel = atoi(argv[++i]);
LogLevel = debuglevel;
printBanner = 1;
} else if (!strcmp(argv[i], "-implicit")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -implicit\n");
- return -1;
+ fprintf(stderr, "missing argument for -implicit\n");
+ return -1;
}
implicitAdminRights = ParseRights(argv[++i]);
if (implicitAdminRights < 0)
} else if (!strcmp(argv[i], "-S")) {
SawS = 1;
} else if (!strcmp(argv[i], "-p")) {
- int lwps_max =
- max_fileserver_thread() - FILESERVER_HELPER_THREADS;
Sawlwps = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -p\n");
- return -1;
+ fprintf(stderr, "missing argument for -p\n");
+ return -1;
}
lwps = atoi(argv[++i]);
- if (lwps > lwps_max)
- lwps = lwps_max;
- else if (lwps < 6)
- lwps = 6;
} else if (!strcmp(argv[i], "-b")) {
Sawbufs = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -b\n");
- return -1;
+ fprintf(stderr, "missing argument for -b\n");
+ return -1;
}
buffs = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-l")) {
Sawlarge = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -l\n");
- return -1;
+ fprintf(stderr, "missing argument for -l\n");
+ return -1;
}
large = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-vc")) {
SawVC = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -vc\n");
- return -1;
+ fprintf(stderr, "missing argument for -vc\n");
+ return -1;
}
volcache = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-novbc")) {
} else if (!strcmp(argv[i], "-rxpck")) {
Sawrxpck = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -rxpck\n");
- return -1;
+ fprintf(stderr, "missing argument for -rxpck\n");
+ return -1;
}
rxpackets = atoi(argv[++i]);
#ifdef AFS_PTHREAD_ENV
} else if (!strcmp(argv[i], "-vattachpar")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
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;
fs_state.options.fs_state_restore = 0;
} else if (!strcmp(argv[i], "-fs-state-verify")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
i++;
if (!strcmp(argv[i], "none")) {
return -1;
}
} else if (!strcmp(argv[i], "-vhashsize")) {
+ int hashsize;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ hashsize = atoi(argv[++i]);
+ if (VSetVolHashSize(hashsize)) {
+ fprintf(stderr, "specified -vhashsize (%s) is invalid or out "
+ "of range\n", argv[i]);
+ return -1;
}
- VSetVolHashSize(atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlrudisable")) {
VLRU_SetOptions(VLRU_SET_ENABLED, 0);
} else if (!strcmp(argv[i], "-vlruthresh")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_THRESH, 60*atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlruinterval")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_INTERVAL, atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlrumax")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_MAX, atoi(argv[++i]));
+ } else if (!strcmp(argv[i], "-unsafe-nosalvage")) {
+ unsafe_attach = 1;
#endif /* AFS_DEMAND_ATTACH_FS */
} else if (!strcmp(argv[i], "-s")) {
Sawsmall = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -s\n");
- return -1;
+ fprintf(stderr, "missing argument for -s\n");
+ return -1;
}
nSmallVns = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-abortthreshold")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -abortthreshold\n");
- return -1;
+ fprintf(stderr, "missing argument for -abortthreshold\n");
+ return -1;
}
abort_threshold = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-k")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -k\n");
- return -1;
+ fprintf(stderr, "missing argument for -k\n");
+ return -1;
}
stack = atoi(argv[++i]);
}
#endif
else if (!strcmp(argv[i], "-spare")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -spare\n");
- return -1;
+ fprintf(stderr, "missing argument for -spare\n");
+ return -1;
}
BlocksSpare = atoi(argv[++i]);
SawSpare = 1;
} else if (!strcmp(argv[i], "-pctspare")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -pctspare\n");
- return -1;
+ fprintf(stderr, "missing argument for -pctspare\n");
+ return -1;
}
PctSpare = atoi(argv[++i]);
BlocksSpare = 0; /* has non-zero default */
SawPctSpare = 1;
} else if (!strcmp(argv[i], "-w")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -w\n");
- return -1;
+ fprintf(stderr, "missing argument for -w\n");
+ return -1;
}
fiveminutes = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-hr")) {
int hr;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -hr\n");
- return -1;
+ fprintf(stderr, "missing argument for -hr\n");
+ return -1;
}
hr = atoi(argv[++i]);
if ((hr < 1) || (hr > 36)) {
else if (!strcmp(argv[i], "-cb")) {
Sawcbs = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -cb\n");
- return -1;
+ fprintf(stderr, "missing argument for -cb\n");
+ return -1;
}
numberofcbs = atoi(argv[++i]);
if ((numberofcbs < 10000) || (numberofcbs > 2147483647)) {
} else if (!strcmp(argv[i], "-busyat")) {
Sawbusy = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -busyat\n");
- return -1;
+ fprintf(stderr, "missing argument for -busyat\n");
+ return -1;
}
busy_threshold = atoi(argv[++i]);
if (busy_threshold < 10) {
else if (!strcmp(argv[i], "-m")) {
extern int aixlow_water;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -m\n");
- return -1;
+ fprintf(stderr, "missing argument for -m\n");
+ return -1;
}
aixlow_water = atoi(argv[++i]);
if ((aixlow_water < 0) || (aixlow_water > 30)) {
rxkadDisableDotCheck = 1;
} else if (!strcmp(argv[i], "-rxmaxmtu")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -rxmaxmtu\n");
- return -1;
+ fprintf(stderr, "missing argument for -rxmaxmtu\n");
+ return -1;
}
rxMaxMTU = atoi(argv[++i]);
- if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
+ if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
(rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
printf("rxMaxMTU %d%% invalid; must be between %d-%" AFS_SIZET_FMT "\n",
- rxMaxMTU, RX_MIN_PACKET_SIZE,
+ rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
}
extern char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
extern int num_lrealms;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -realm\n");
- return -1;
+ fprintf(stderr, "missing argument for -realm\n");
+ return -1;
}
if (strlen(argv[++i]) >= AFS_REALM_SZ) {
printf
AFS_REALM_SZ);
return -1;
}
- if (num_lrealms == -1)
+ if (num_lrealms == -1)
num_lrealms = 0;
if (num_lrealms >= AFS_NUM_LREALMS) {
printf
else if (strcmp(argv[i], "-mrafslogs") == 0) {
/* set syslog logging flag */
mrafsStyleLogs = 1;
- }
+ }
else if (strcmp(argv[i], "-saneacls") == 0) {
saneacls = 1;
}
+ else if (strcmp(argv[i], "-offline-timeout") == 0) {
+ if (i + 1 >= argc) {
+ printf("You have to specify -offline-timeout <integer>\n");
+ return -1;
+ }
+ offline_timeout = atoi(argv[++i]);
+#ifndef AFS_PTHREAD_ENV
+ if (offline_timeout != -1) {
+ printf("The only valid -offline-timeout value for the LWP "
+ "fileserver is -1\n");
+ return -1;
+ }
+#endif /* AFS_PTHREAD_ENV */
+ if (offline_timeout < -1) {
+ printf("Invalid -offline-timeout value %s; the only valid "
+ "negative value is -1\n", argv[i]);
+ return -1;
+ }
+ }
+ else if (strcmp(argv[i], "-offline-shutdown-timeout") == 0) {
+ if (i + 1 >= argc) {
+ printf("You have to specify -offline-shutdown-timeout "
+ "<integer>\n");
+ return -1;
+ }
+ offline_shutdown_timeout = atoi(argv[++i]);
+#ifndef AFS_PTHREAD_ENV
+ if (offline_shutdown_timeout != -1) {
+ printf("The only valid -offline-shutdown-timeout value for the "
+ "LWP fileserver is -1\n");
+ return -1;
+ }
+#endif /* AFS_PTHREAD_ENV */
+ if (offline_shutdown_timeout < -1) {
+ printf("Invalid -offline-timeout value %s; the only valid "
+ "negative value is -1\n", argv[i]);
+ return -1;
+ }
+ }
else {
return (-1);
}
if (auditFileName)
osi_audit_file(auditFileName);
+ lwps_max = max_fileserver_thread() - FILESERVER_HELPER_THREADS;
+ if (lwps > lwps_max)
+ lwps = lwps_max;
+ else if (lwps < 6)
+ lwps = 6;
+
return (0);
} /*ParseArgs */
-
-#define MAXPARMS 15
-
+/* Once upon a time, in a galaxy far far away, IBM AFS supported the use of
+ * a file /vice/file/parms, the contents of which would override any command
+ * line parameters. We no longer support the use of such a file, but we warn
+ * if we encounter its presence from an older release
+ */
static void
-NewParms(int initializing)
+CheckParms(void)
{
- static struct afs_stat sbuf;
- register int i, fd;
- char *parms;
- char *argv[MAXPARMS];
- register int argc;
-
- if (!(afs_stat("/vice/file/parms", &sbuf))) {
- parms = (char *)malloc(sbuf.st_size);
- if (!parms)
- return;
- fd = afs_open("parms", O_RDONLY, 0666);
- if (fd <= 0) {
- ViceLog(0, ("Open for parms failed with errno = %d\n", errno));
- return;
- }
-
- i = read(fd, parms, sbuf.st_size);
- close(fd);
- if (i != sbuf.st_size) {
- if (i < 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));
- }
- free(parms);
- return;
- }
-
- for (i = 0; i < MAXPARMS; argv[i++] = 0);
-
- for (argc = i = 0; i < sbuf.st_size; i++) {
- if ((*(parms + i) != ' ') && (*(parms + i) != '\n')) {
- if (argv[argc] == 0)
- argv[argc] = (parms + i);
- } else {
- *(parms + i) = '\0';
- if (argv[argc] != 0) {
- if (++argc == MAXPARMS)
- break;
- }
- while ((*(parms + i + 1) == ' ')
- || (*(parms + i + 1) == '\n'))
- i++;
- }
- }
- if (ParseArgs(argc, argv) == 0) {
- ViceLog(0, ("Change parameters to:"));
- } else {
- ViceLog(0, ("Invalid parameter in:"));
- }
- for (i = 0; i < argc; i++) {
- ViceLog(0, (" %s", argv[i]));
- }
- ViceLog(0, ("\n"));
- free(parms);
- } else if (!initializing)
- ViceLog(0,
- ("Received request to change parms but no parms file exists\n"));
-
-} /*NewParms */
+ struct afs_stat sbuf;
+ if (afs_stat("/vice/file/parms", &sbuf) == 0) {
+ ViceLog(0, ("Using /vice/file/parms to override command line "
+ "options is no longer supported"));
+ }
+}
/* Miscellaneous routines */
void
Die(char *msg)
{
- ViceLog(0, ("%s\n", msg));
- assert(0);
+ ViceLogThenPanic(0, ("%s\n", msg));
} /*Die */
}
#ifdef AFS_PTHREAD_ENV
- assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
+ osi_Assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
#endif
SystemId = SYSADMINID;
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;
errno));
return EIO;
}
- if ((i = read(fd, (char *)&vsn, sizeof(vsn))) != sizeof(vsn)) {
+ if (read(fd, (char *)&vsn, sizeof(vsn)) != sizeof(vsn)) {
ViceLog(0,
("%s: Read failed (%d)\n", AFSDIR_SERVER_SYSID_FILEPATH,
errno));
AFSDIR_SERVER_SYSID_FILEPATH, vsn.version, SYSIDVERSION));
return EIO;
}
- if ((i =
- read(fd, (char *)&uuid,
- sizeof(struct afsUUID))) != sizeof(struct afsUUID)) {
+ if (read(fd, (char *)&uuid, sizeof(struct afsUUID))
+ != sizeof(struct afsUUID)) {
ViceLog(0,
("%s: read of uuid failed (%d)\n",
AFSDIR_SERVER_SYSID_FILEPATH, errno));
}
afs_ntohuuid(&uuid);
FS_HostUUID = uuid;
- if ((i =
- read(fd, (char *)&nentries,
- sizeof(afs_int32))) != sizeof(afs_int32)) {
+ if (read(fd, (char *)&nentries, sizeof(afs_int32)) != sizeof(afs_int32)) {
ViceLog(0,
("%s: Read of entries failed (%d)\n",
AFSDIR_SERVER_SYSID_FILEPATH, errno));
}
/*
- * defect 10966
+ * defect 10966
* This routine sets up the buffers for the VL_RegisterAddrs RPC. All addresses
* in FS_HostAddrs[] are in NBO, while the RPC treats them as a "blob" of data
- * and so we need to convert each of them into HBO which is what the extra
+ * and so we need to convert each of them into HBO which is what the extra
* array called FS_HostAddrs_HBO is used here.
*/
static afs_int32
Do_VLRegisterRPC(void)
{
- register int code;
+ int code;
bulkaddrs addrs;
afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
int i = 0;
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
+ * 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];
if (FS_HostAddr_cnt == 1 && rxBind == 1)
code = FS_HostAddrs[0];
- else
+ else
code = htonl(INADDR_ANY);
return 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;
#endif
int curLimit;
time_t t;
+ struct tm tm;
afs_uint32 rx_bindhost;
+ VolumePackageOptions opts;
#ifdef AFS_AIX32_ENV
struct sigaction nsa;
argv[0]);
exit(2);
}
-#ifndef AFS_QUIETFS_ENV
- console = afs_fopen("/dev/console", "w");
-#endif
+ /* set ihandle package defaults prior to parsing args */
+ ih_PkgDefaults();
+
+ /* check for the parameter file */
+ CheckParms();
if (ParseArgs(argc, argv)) {
FlagMsg();
exit(-1);
}
#ifdef AFS_PTHREAD_ENV
- assert(pthread_mutex_init(&fileproc_glock_mutex, NULL) == 0);
+ MUTEX_INIT(&fileproc_glock_mutex, "fileproc", MUTEX_DEFAULT, 0);
#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_SGI_VNODE_GLUE
exit(-1);
}
- NewParms(1);
-
/* Open FileLog on stdout, stderr, fd 1 and fd2 (for perror), sigh. */
#ifndef AFS_NT40_ENV
serverLogSyslogTag = "fileserver";
ViceLog(0, ("Both -spare and -pctspare specified, exiting.\n"));
exit(-1);
}
-#ifdef AFS_SGI_XFS_IOPS_ENV
- ViceLog(0, ("XFS/EFS File server starting\n"));
-#else
- ViceLog(0, ("File server starting\n"));
-#endif
+ LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
/* initialize the pthread soft signal handler thread */
schedctl(NDPRI, 0, NDPNORMMAX);
if (SawLock)
plock(PROCLOCK);
-#else
-#ifndef AFS_NT40_ENV
+#elif !defined(AFS_NT40_ENV)
nice(-5); /* TODO: */
#endif
+ DInit(buffs);
+#ifdef AFS_DEMAND_ATTACH_FS
+ FS_STATE_INIT;
#endif
- assert(DInit(buffs) == 0);
#ifdef AFS_NT40_ENV
if (afs_winsockInit() < 0) {
#endif
CheckAdminName();
- /* if we support more than 16 threads, then we better have the ability
- ** to keep open a large number of files simultaneously
+ /* if we support more than 16 threads, then we better have the ability
+ ** to keep open a large number of files simultaneously
*/
#if defined(AFS_AIX_ENV) && !defined(AFS_AIX42_ENV)
curLimit = OPEN_MAX; /* for pre AIX 4.2 systems */
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) ==
+ osi_Assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
LWP_SUCCESS);
#endif /* !AFS_PTHREAD_ENV */
}
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);
- tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
+ afsconf_SetSecurityFlags(confDir, AFSCONF_SECOPTS_ALWAYSENCRYPT);
+ afsconf_BuildServerSecurityObjects(confDir, &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);
/* 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
+ CV_INIT(&fsync_cond, "fsync", CV_DEFAULT, 0);
+ MUTEX_INIT(&fsync_glock_mutex, "fsync", MUTEX_DEFAULT, 0);
#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
#endif
/* we ensure that there is enough space in the vnode buffer to satisfy
- ** requests from all concurrent threads.
+ ** requests from all concurrent threads.
** the maximum number of vnodes used by a single thread at any one time
** is three ( "link" uses three vnodes simultaneously, one vLarge and
** two vSmall for linking files and two vLarge and one vSmall for linking
- ** files ) : dhruba
+ ** files ) : dhruba
*/
minVnodesRequired = 2 * lwps + 1;
if (minVnodesRequired > nSmallVns) {
/* We now do this after getting the listener up and running, so that client
* connections don't timeout (maybe) if a file server is restarted, since it
- * will be available "real soon now". Worry about whether we can satisfy the
+ * 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;
+ opts.unsafe_attach = unsafe_attach;
+ if (offline_timeout != -1) {
+ opts.interrupt_rxcall = rx_InterruptCall;
+ opts.offline_timeout = offline_timeout;
+ }
+ if (offline_shutdown_timeout == -1) {
+ /* default to -offline-timeout, if shutdown-specific timeout is not
+ * specified */
+ opts.offline_shutdown_timeout = offline_timeout;
+ } else {
+ opts.interrupt_rxcall = rx_InterruptCall;
+ opts.offline_shutdown_timeout = offline_shutdown_timeout;
+ }
+
+ 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);
+ osi_Assert(pthread_attr_init(&tattr) == 0);
+ osi_Assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, FiveMinuteCheckLWP,
&fiveminutes) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
#else /* AFS_PTHREAD_ENV */
ViceLog(5, ("Starting LWP\n"));
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(FiveMinuteCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "FiveMinuteChecks",
&serverPid) == LWP_SUCCESS);
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(HostCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "HostCheck", &serverPid) == LWP_SUCCESS);
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(FsyncCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "FsyncCheck", &serverPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
FT_GetTimeOfDay(&tp, 0);
-#ifndef AFS_QUIETFS_ENV
- if (console != NULL) {
- time_t t = tp.tv_sec;
- fprintf(console, "File server has started at %s\r",
- afs_ctime(&t, tbuffer, sizeof(tbuffer)));
- }
-#endif
-
/*
* Figure out the FileServer's name and primary address.
*/
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",
- afs_ctime(&t, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&t, &tm));
+ ViceLog(0, ("File Server started %s\n", tbuffer));
#if FS_STATS_DETAILED
afs_FullPerfStats.det.epoch.tv_sec = StartTime = tp.tv_sec;
#endif
sleep(1000); /* long time */
}
#else /* AFS_PTHREAD_ENV */
- assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
+ osi_Assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
return 0;
}
git://git.openafs.org / openafs.git / blobdiff