#include <rx/rx_queue.h>
#include <lwp.h>
#include <opr/lock.h>
+#include <opr/proc.h>
#include <afs/cmd.h>
#include <afs/ptclient.h>
#include <afs/afsint.h>
int eventlog = 0, rxlog = 0;
FILE *debugFile;
+char *logFile = NULL;
pthread_mutex_t fsync_glock_mutex;
pthread_cond_t fsync_cond;
* 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 */
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));
OPT_vlruinterval,
OPT_vlrumax,
OPT_unsafe_nosalvage,
- OPT_stack,
OPT_cbwait,
OPT_novbc,
OPT_auditlog,
OPT_rxmaxmtu,
OPT_udpsize,
OPT_dotted,
- OPT_realm
+ OPT_realm,
+ OPT_sync
};
static int
int lwps_max;
char *auditFileName = NULL;
+ char *sync_behavior = NULL;
#if defined(AFS_AIX32_ENV)
extern int aixlow_water;
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,
#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_threads, "-p", CMD_SINGLE, CMD_OPTIONAL,
"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");
cmd_OptionAsInt(opts, OPT_buffers, &buffs);
if (cmd_OptionAsInt(opts, OPT_callbacks, &numberofcbs) == 0) {
- printf("number of cbs %d invalid; "
- "must be between 10000 and 2147483647\n", numberofcbs);
- return -1;
+ if ((numberofcbs < 10000) || (numberofcbs > 2147483647)) {
+ printf("number of cbs %d invalid; "
+ "must be between 10000 and 2147483647\n", numberofcbs);
+ return -1;
+ }
}
cmd_OptionAsInt(opts, OPT_vcsize, &volcache);
&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;
+ }
+ }
#ifdef AFS_DEMAND_ATTACH_FS
if (cmd_OptionPresent(opts, OPT_fs_state_dont_save))
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);
}
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) {
busy_threshold = 3 * rxpackets / 2;
}
+ cmd_OptionAsString(opts, OPT_logfile, &logFile);
+ 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 */
exit(1);
}
code = afsconf_GetCellInfo(dir, NULL, AFSCONF_VLDBSERVICE, &info);
+ if (code) {
+ ViceLog(0,
+ ("vl_Initialize: Failed to get cell information\n"));
+ exit(1);
+ }
if (info.numServers > MAXSERVERS) {
ViceLog(0,
("vl_Initialize: info.numServers=%d (> MAXSERVERS=%d)\n",
/* check for the parameter file */
CheckParms();
+ FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
+ logFile = strdup(AFSDIR_SERVER_FILELOG_FILEPATH);
+
if (ParseArgs(argc, argv)) {
exit(-1);
}
exit(1);
}
#endif
- FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
confDir = afsconf_Open(FS_configPath);
if (!confDir) {
#ifndef AFS_NT40_ENV
serverLogSyslogTag = "fileserver";
#endif
- OpenLog(AFSDIR_SERVER_FILELOG_FILEPATH);
+ OpenLog(logFile);
SetupLogSignals();
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 */
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();
git://git.openafs.org / openafs.git / blobdiff