#include <rx/rx_queue.h>
#include <lwp.h>
#include <opr/lock.h>
+#include <opr/proc.h>
+#include <opr/softsig.h>
+#include <afs/procmgmt_softsig.h> /* must come after softsig.h */
#include <afs/cmd.h>
#include <afs/ptclient.h>
#include <afs/afsint.h>
#include <afs/audit.h>
#include <afs/partition.h>
#include <afs/dir.h>
-#ifndef AFS_NT40_ENV
-# include <afs/softsig.h>
-#endif
+#include <afs/afsutil.h>
#include "viced_prototypes.h"
#include "viced.h"
#include "host.h"
extern int etext;
-void *ShutDown(void *);
static void ClearXStatValues(void);
static void PrintCounters(void);
-static void ResetCheckDescriptors(void);
-static void ResetCheckSignal(void);
-static void *CheckSignal(void *);
static afs_int32 Do_VLRegisterRPC(void);
int eventlog = 0, rxlog = 0;
FILE *debugFile;
+static struct logOptions logopts;
pthread_mutex_t fsync_glock_mutex;
pthread_cond_t fsync_cond;
*/
struct afs_PerfStats afs_perfstats;
-extern int LogLevel;
extern int Statistics;
int busyonrst = 1;
* already implied */
afs_int32 readonlyServer = 0;
-int stack = 24;
int stackSize = 24000;
int fiveminutes = 300; /* 5 minutes. Change this for debugging only */
int CurrentConnections = 0;
static int panic_timeout = 30 * 60;
#endif
+static int host_thread_quota;
int rxpackets = 150; /* 100 */
int nSmallVns = 400; /* 200 */
int large = 400; /* 200 */
*/
/* DEBUG HACK */
-static void *
-CheckDescriptors(void *unused)
-{
#ifndef AFS_NT40_ENV
+void
+CheckDescriptors_Signal(int signo)
+{
struct afs_stat status;
int tsize = getdtablesize();
int i;
}
}
fflush(stdout);
- ResetCheckDescriptors();
+}
#endif
- return 0;
-} /*CheckDescriptors */
-
+/* Signal number for dumping debug info is platform dependent. */
+#if defined(AFS_HPUX_ENV)
+# define AFS_SIG_CHECK SIGPOLL
+#elif defined(AFS_NT40_ENV)
+# define AFS_SIG_CHECK SIGUSR2
+#else
+# define AFS_SIG_CHECK SIGXCPU
+#endif
void
CheckSignal_Signal(int x)
{
- CheckSignal(NULL);
+ if (FS_registered > 0) {
+ /*
+ * We have proper ip addresses; tell the vlserver what we got; the following
+ * routine will do the proper reporting for us
+ */
+ Do_VLRegisterRPC();
+ }
+ h_DumpHosts();
+ h_PrintClients();
+ DumpCallBackState();
+ PrintCounters();
}
void
ShutDown_Signal(int x)
{
- ShutDown(NULL);
-}
-
-void
-CheckDescriptors_Signal(int x)
-{
- CheckDescriptors(NULL);
+ ShutDownAndCore(DONTPANIC);
}
/* check whether caller is authorized to perform admin operations */
return islocal;
}
-static void
-ResetCheckSignal(void)
-{
- int signo;
-
-#if defined(AFS_HPUX_ENV)
- signo = SIGPOLL;
-#elif defined(AFS_NT40_ENV)
- signo = SIGUSR2;
-#else
- signo = SIGXCPU;
-#endif
-
-#if !defined(AFS_NT40_ENV)
- softsig_signal(signo, CheckSignal_Signal);
-#else
- signal(signo, CheckSignal_Signal);
-#endif
-}
-
-static void
-ResetCheckDescriptors(void)
+#if defined(AFS_NT40_ENV)
+/* no viced_syscall */
+#elif defined(AFS_DARWIN160_ENV)
+/* no viced_syscall */
+#elif !defined(AFS_SYSCALL)
+int
+viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
-#ifndef AFS_NT40_ENV
- softsig_signal(SIGTERM, CheckDescriptors_Signal);
-#endif
+ errno = ENOSYS;
+ return -1;
}
-
-#ifndef AFS_NT40_ENV
+#else
int
viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
static void
CheckAdminName(void)
{
- int fd = 0;
+ int fd = -1;
struct afs_stat status;
if ((afs_stat("/AdminName", &status)) || /* if file does not exist */
(status.st_size <= 0) || /* or it is too short */
(status.st_size >= (MAXADMINNAME)) || /* or it is too long */
- !(fd = afs_open("/AdminName", O_RDONLY, 0))) { /* or the open fails */
+ (fd = afs_open("/AdminName", O_RDONLY, 0)) < 0 || /* or open fails */
+ read(fd, adminName, status.st_size) != status.st_size) { /* or read */
+
strcpy(adminName, "System:Administrators"); /* use the default name */
- } else {
- (void)read(fd, adminName, status.st_size); /* use name from the file */
}
- if (fd)
+ if (fd >= 0)
close(fd); /* close fd if it was opened */
} /*CheckAdminName */
#endif
/* close the log so it can be removed */
- ReOpenLog(AFSDIR_SERVER_FILELOG_FILEPATH); /* don't trunc, just append */
+ ReOpenLog(); /* don't trunc, just append */
ViceLog(2, ("Cleaning up timed out callbacks\n"));
if (CleanupTimedOutCallBacks())
ViceLog(5, ("Timed out callbacks deleted\n"));
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif
} /*FiveMinuteCheckLWP */
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif
} /*HostCheckLWP */
/* This LWP does fsync checks every 5 minutes: it should not be used for
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif /* AFS_DEMAND_ATTACH_FS */
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif /* !AFS_DEMAND_ATTACH_FS */
}
/*------------------------------------------------------------------------
ViceLog(0, ("Vice was last started at %s\n", tbuffer));
#ifdef AFS_DEMAND_ATTACH_FS
- if (LogLevel >= 125) {
+ if (GetLogLevel() >= 125) {
stats_flags = VOL_STATS_PER_CHAIN2;
- } else if (LogLevel >= 25) {
+ } else if (GetLogLevel() >= 25) {
stats_flags = VOL_STATS_PER_CHAIN;
}
VPrintExtendedCacheStats(stats_flags);
audit_PrintStats(stderr);
h_PrintStats();
PrintCallBackStats();
-#ifdef AFS_NT40_ENV
- processSize = -1; /* TODO: */
-#else
- processSize = (int)((long)sbrk(0) >> 10);
-#endif
+ processSize = opr_procsize();
ViceLog(0,
("There are %d connections, process size %d\n",
CurrentConnections, processSize));
} /*PrintCounters */
-
-
-static void *
-CheckSignal(void *unused)
-{
- if (FS_registered > 0) {
- /*
- * We have proper ip addresses; tell the vlserver what we got; the following
- * routine will do the proper reporting for us
- */
- Do_VLRegisterRPC();
- }
- h_DumpHosts();
- h_PrintClients();
- DumpCallBackState();
- PrintCounters();
- ResetCheckSignal();
- return 0;
-} /*CheckSignal */
-
static void *
ShutdownWatchdogLWP(void *unused)
{
exit(0);
}
-void *
-ShutDown(void *unused)
-{ /* backward compatibility */
- ShutDownAndCore(DONTPANIC);
- return 0;
-}
-
static afs_int32
ParseRights(char *arights)
{
* AIX: sysconf() limit is real
* HP-UX: sysconf() limit is real
* IRIX: sysconf() limit is apparently NOT real -- too small
- * DUX: sysconf() limit is apparently NOT real -- too big
* Linux: sysconf() limit is apparently NOT real -- too big
* Solaris: no sysconf() limit
*/
OPT_vlruinterval,
OPT_vlrumax,
OPT_unsafe_nosalvage,
- OPT_stack,
OPT_cbwait,
OPT_novbc,
OPT_auditlog,
OPT_logfile,
OPT_mrafslogs,
OPT_threads,
+#ifdef HAVE_SYSLOG
OPT_syslog,
+#endif
OPT_peer,
OPT_process,
OPT_nojumbo,
OPT_rxmaxmtu,
OPT_udpsize,
OPT_dotted,
- OPT_realm
+ OPT_realm,
+ OPT_sync,
+ OPT_transarc_logs
};
static int
int lwps_max;
char *auditFileName = NULL;
+ char *sync_behavior = NULL;
#if defined(AFS_AIX32_ENV)
extern int aixlow_water;
#endif
- opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL);
+ opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL);
/* fileserver options */
cmd_AddParmAtOffset(opts, OPT_large, "-L", CMD_FLAG,
cmd_AddParmAtOffset(opts, OPT_spare, "-spare", CMD_SINGLE,
CMD_OPTIONAL, "kB overage on volume quota");
- cmd_AddParmAtOffset(opts, OPT_pctspare, "pctspare", CMD_SINGLE,
+ cmd_AddParmAtOffset(opts, OPT_pctspare, "-pctspare", CMD_SINGLE,
CMD_OPTIONAL, "percentage overage on volume quota");
cmd_AddParmAtOffset(opts, OPT_hostcpsrefresh, "-hr", CMD_SINGLE,
cmd_AddParmAtOffset(opts, OPT_vhandle_initial_cachesize,
"-vhandle-initial-cachesize", CMD_SINGLE,
CMD_OPTIONAL, "# fds reserved for cache IO");
+ cmd_AddParmAtOffset(opts, OPT_vhashsize, "-vhashsize",
+ CMD_SINGLE, CMD_OPTIONAL,
+ "log(2) of # of volume hash buckets");
#ifdef AFS_DEMAND_ATTACH_FS
/* dafs options */
"disable state restore during startup");
cmd_AddParmAtOffset(opts, OPT_fs_state_verify, "-fs-state-verify",
CMD_SINGLE, CMD_OPTIONAL, "none|save|restore|both");
- cmd_AddParmAtOffset(opts, OPT_vhashsize, "-vhashsize",
- CMD_SINGLE, CMD_OPTIONAL,
- "log(2) of # of volume hash buckets");
cmd_AddParmAtOffset(opts, OPT_vlrudisable, "-vlrudisable",
CMD_FLAG, CMD_OPTIONAL, "disable VLRU functionality");
cmd_AddParmAtOffset(opts, OPT_vlruthresh, "-vlruthresh",
#endif
/* unrecommend options - should perhaps be CMD_HIDE */
- cmd_AddParmAtOffset(opts, OPT_stack, "-k", CMD_SINGLE, CMD_OPTIONAL,
- "stack size");
cmd_AddParmAtOffset(opts, OPT_cbwait, "-w", CMD_SINGLE, CMD_OPTIONAL,
"callback wait interval");
cmd_AddParmAtOffset(opts, OPT_novbc, "-novbc", CMD_SINGLE, CMD_FLAG,
CMD_OPTIONAL, "location of audit log");
cmd_AddParmAtOffset(opts, OPT_auditiface, "-audit-interface", CMD_SINGLE,
CMD_OPTIONAL, "interface to use for audit logging");
- cmd_AddParmAtOffset(opts, OPT_config, "-config", CMD_SINGLE, CMD_OPTIONAL,
- "configuration location");
cmd_AddParmAtOffset(opts, OPT_debug, "-d", CMD_SINGLE, CMD_OPTIONAL,
"debug level");
- cmd_AddParmAtOffset(opts, OPT_logfile, "-logfile", CMD_SINGLE,
- CMD_OPTIONAL, "location of logfile");
cmd_AddParmAtOffset(opts, OPT_mrafslogs, "-mrafslogs", CMD_FLAG,
CMD_OPTIONAL, "enable MRAFS style logging");
+ cmd_AddParmAtOffset(opts, OPT_transarc_logs, "-transarc-logs", CMD_FLAG,
+ CMD_OPTIONAL, "enable Transarc style logging");
cmd_AddParmAtOffset(opts, OPT_threads, "-p", CMD_SINGLE, CMD_OPTIONAL,
"number of threads");
-#if !defined(AFS_NT40_ENV)
+#ifdef HAVE_SYSLOG
cmd_AddParmAtOffset(opts, OPT_syslog, "-syslog", CMD_SINGLE_OR_FLAG,
CMD_OPTIONAL, "log to syslog");
#endif
"permit Kerberos 5 principals with dots");
cmd_AddParmAtOffset(opts, OPT_realm, "-realm",
CMD_LIST, CMD_OPTIONAL, "local realm");
+ cmd_AddParmAtOffset(opts, OPT_sync, "-sync",
+ CMD_SINGLE, CMD_OPTIONAL, "always | onclose | never");
+
+ /* testing options */
+ cmd_AddParmAtOffset(opts, OPT_logfile, "-logfile", CMD_SINGLE,
+ CMD_OPTIONAL, "location of log file");
+ cmd_AddParmAtOffset(opts, OPT_config, "-config", CMD_SINGLE,
+ CMD_OPTIONAL, "configuration location");
code = cmd_Parse(argc, argv, &opts);
+ if (code == CMD_HELP) {
+ exit(0);
+ }
if (code)
return -1;
- /* XXX - cmd_OptionAsString(opts, OPT_config, &configDir); */
-
cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
cmd_SetCommandName("fileserver");
&vol_io_params.fd_max_cachesize);
cmd_OptionAsUint(opts, OPT_vhandle_initial_cachesize,
&vol_io_params.fd_initial_cachesize);
+ if (cmd_OptionAsString(opts, OPT_sync, &sync_behavior) == 0) {
+ if (ih_SetSyncBehavior(sync_behavior)) {
+ printf("Invalid -sync value %s\n", sync_behavior);
+ return -1;
+ }
+ }
+ if (cmd_OptionAsInt(opts, OPT_vhashsize, &optval) == 0) {
+ if (VSetVolHashSize(optval)) {
+ fprintf(stderr, "specified -vhashsize (%d) is invalid or out "
+ "of range\n", optval);
+ return -1;
+ }
+ }
#ifdef AFS_DEMAND_ATTACH_FS
if (cmd_OptionPresent(opts, OPT_fs_state_dont_save))
return -1;
}
}
- if (cmd_OptionAsInt(opts, OPT_vhashsize, &optval) == 0) {
- if (VSetVolHashSize(optval)) {
- fprintf(stderr, "specified -vhashsize (%d) is invalid or out "
- "of range\n", optval);
- return -1;
- }
- }
if (cmd_OptionPresent(opts, OPT_vlrudisable))
VLRU_SetOptions(VLRU_SET_ENABLED, 0);
if (cmd_OptionAsInt(opts, OPT_vlruthresh, &optval) == 0)
cmd_OptionAsFlag(opts, OPT_unsafe_nosalvage, &unsafe_attach);
#endif /* AFS_DEMAND_ATTACH_FS */
- cmd_OptionAsInt(opts, OPT_stack, &stack);
cmd_OptionAsInt(opts, OPT_cbwait, &fiveminutes);
cmd_OptionAsFlag(opts, OPT_novbc, &novbc);
optstring = NULL;
}
- cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
- /* XXX - cmd_OptionAsString(opts, OPT_logfile, &logFile); */
- cmd_OptionAsFlag(opts, OPT_mrafslogs, &mrafsStyleLogs);
-
if (cmd_OptionAsInt(opts, OPT_threads, &lwps) == 0) {
lwps_max = max_fileserver_thread() - FILESERVER_HELPER_THREADS;
if (lwps > lwps_max)
lwps = 6;
}
-#ifndef AFS_NT40_ENV
+ /* Logging options. */
+#ifdef HAVE_SYSLOG
if (cmd_OptionPresent(opts, OPT_syslog)) {
- serverLogSyslog = 1;
- cmd_OptionAsInt(opts, OPT_syslog, &serverLogSyslogFacility);
- }
+ if (cmd_OptionPresent(opts, OPT_logfile)) {
+ fprintf(stderr, "Invalid options: -syslog and -logfile are exclusive.\n");
+ return -1;
+ }
+ if (cmd_OptionPresent(opts, OPT_transarc_logs)) {
+ fprintf(stderr, "Invalid options: -syslog and -transarc-logs are exclusive.\n");
+ return -1;
+ }
+ if (cmd_OptionPresent(opts, OPT_mrafslogs)) {
+ fprintf(stderr, "Invalid options: -syslog and -mrafslogs are exclusive.\n");
+ return -1;
+ }
+
+ logopts.lopt_dest = logDest_syslog;
+ logopts.lopt_facility = LOG_DAEMON;
+ logopts.lopt_tag = "fileserver";
+ cmd_OptionAsInt(opts, OPT_syslog, &logopts.lopt_facility);
+ } else
#endif
+ {
+ logopts.lopt_dest = logDest_file;
+
+ if (cmd_OptionPresent(opts, OPT_transarc_logs)) {
+ if (cmd_OptionPresent(opts, OPT_mrafslogs)) {
+ fprintf(stderr,
+ "Invalid options: -transarc-logs and -mrafslogs are exclusive.\n");
+ return -1;
+ }
+ logopts.lopt_rotateOnOpen = 1;
+ logopts.lopt_rotateStyle = logRotate_old;
+ } else if (cmd_OptionPresent(opts, OPT_mrafslogs)) {
+ logopts.lopt_rotateOnOpen = 1;
+ logopts.lopt_rotateOnReset = 1;
+ logopts.lopt_rotateStyle = logRotate_timestamp;
+ }
+
+ if (cmd_OptionPresent(opts, OPT_logfile))
+ cmd_OptionAsString(opts, OPT_logfile, (char**)&logopts.lopt_filename);
+ else
+ logopts.lopt_filename = AFSDIR_SERVER_FILELOG_FILEPATH;
+
+ }
+ cmd_OptionAsInt(opts, OPT_debug, &logopts.lopt_logLevel);
if (cmd_OptionPresent(opts, OPT_peer))
rx_enablePeerRPCStats();
busy_threshold = 3 * rxpackets / 2;
}
+ cmd_OptionAsString(opts, OPT_config, &FS_configPath);
+
+
if (auditFileName)
osi_audit_file(auditFileName);
+ if (lwps > 64) {
+ host_thread_quota = 5;
+ } else if (lwps > 32) {
+ host_thread_quota = 4;
+ } else if (lwps > 16) {
+ host_thread_quota = 3;
+ } else {
+ host_thread_quota = 2;
+ }
+
return (0);
} /*ParseArgs */
/* check for the parameter file */
CheckParms();
+ FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
+ memset(&logopts, 0, sizeof(logopts));
+
if (ParseArgs(argc, argv)) {
exit(-1);
}
exit(1);
}
#endif
- FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
confDir = afsconf_Open(FS_configPath);
if (!confDir) {
/* initialize audit user check */
osi_audit_set_user_check(confDir, fs_IsLocalRealmMatch);
- /* Open FileLog on stdout, stderr, fd 1 and fd2 (for perror), sigh. */
-#ifndef AFS_NT40_ENV
- serverLogSyslogTag = "fileserver";
-#endif
- OpenLog(AFSDIR_SERVER_FILELOG_FILEPATH);
- SetupLogSignals();
+ OpenLog(&logopts);
LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
+ if (afsconf_GetLatestKey(confDir, NULL, NULL) == 0) {
+ LogDesWarning();
+ }
-#if !defined(AFS_NT40_ENV)
/* initialize the pthread soft signal handler thread */
- softsig_init();
+ opr_softsig_Init();
+ SetupLogSoftSignals();
+ opr_softsig_Register(AFS_SIG_CHECK, CheckSignal_Signal);
+#ifndef AFS_NT40_ENV
+ opr_softsig_Register(SIGTERM, CheckDescriptors_Signal);
#endif
- /* install signal handlers for controlling the fileserver process */
- ResetCheckSignal(); /* set CheckSignal_Signal() sig handler */
- ResetCheckDescriptors(); /* set CheckDescriptors_Signal() sig handler */
-
#if defined(AFS_SGI_ENV)
/* give this guy a non-degrading priority so help busy servers */
schedctl(NDPRI, 0, NDPNORMMAX);
if (SawLock)
plock(PROCLOCK);
#elif !defined(AFS_NT40_ENV)
- nice(-5); /* TODO: */
+ if (nice(-5) < 0) {
+ /* don't care */
+ }
#endif
DInit(buffs);
#ifdef AFS_DEMAND_ATTACH_FS
acl_Initialize(ACL_VERSION);
/* initialize RX support */
-#ifndef AFS_NT40_ENV
+#if !defined(AFS_NT40_ENV) && !defined(AFS_DARWIN160_ENV)
rxi_syscallp = viced_syscall;
#endif
rx_extraPackets = rxpackets;
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", securityClasses,
rx_SetMinProcs(tservice, 2);
rx_SetMaxProcs(tservice, 4);
- /*
- * Enable RX hot threads, which allows the listener thread to trade
- * places with an idle thread and moves the context switch from listener
- * to worker out of the critical path.
- */
- rx_EnableHotThread();
-
/* Some rx debugging */
if (rxlog || eventlog) {
debugFile = afs_fopen("rx_dbg", "w");
}
init_sys_error_to_et(); /* Set up error table translation */
- h_InitHostPackage(); /* set up local cellname and realmname */
+ h_InitHostPackage(host_thread_quota); /* set up local cellname and realmname */
InitCallBack(numberofcbs);
ClearXStatValues();
/* Install handler to catch the shutdown signal;
* bosserver assumes SIGQUIT shutdown
*/
-#if !defined(AFS_NT40_ENV)
- softsig_signal(SIGQUIT, ShutDown_Signal);
-#else
- (void)signal(SIGQUIT, ShutDown_Signal);
-#endif
+ opr_softsig_Register(SIGQUIT, ShutDown_Signal);
if (VInitAttachVolumes(fileServer)) {
ViceLog(0,
while (1) {
sleep(1000); /* long time */
}
- return 0;
+ AFS_UNREACHED(return(0));
}
git://git.openafs.org / openafs.git / blobdiff