summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/common-utils.h3
-rw-r--r--xlators/nfs/server/src/nfs.c3
-rw-r--r--xlators/protocol/server/src/server.c12
3 files changed, 11 insertions, 7 deletions
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index f11c95fa873..21f8e3cb26e 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -42,7 +42,8 @@ void trap (void);
#include "mem-pool.h"
#include "uuid.h"
-
+#define STRINGIFY(val) #val
+#define TOSTRING(val) STRINGIFY(val)
#define min(a,b) ((a)<(b)?(a):(b))
#define max(a,b) ((a)>(b)?(a):(b))
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index 65814ebc17c..7da66214af8 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -37,9 +37,6 @@
#include "rpc-drc.h"
#include "syscall.h"
-#define STRINGIFY(val) #val
-#define TOSTRING(val) STRINGIFY(val)
-
#define OPT_SERVER_AUX_GIDS "nfs.server-aux-gids"
#define OPT_SERVER_GID_CACHE_TIMEOUT "nfs.server.aux-gid-timeout"
#define OPT_SERVER_RPC_STATD "nfs.rpc-statd"
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 5bd702c537c..3d8e3d66d14 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1048,9 +1048,6 @@ struct volume_options options[] = {
{ .key = {"transport.*"},
.type = GF_OPTION_TYPE_ANY,
},
- { .key = {"rpc*"},
- .type = GF_OPTION_TYPE_ANY,
- },
{ .key = {"inode-lru-limit"},
.type = GF_OPTION_TYPE_INT,
.min = 0,
@@ -1135,5 +1132,14 @@ struct volume_options options[] = {
"overrides the auth.allow option. By default, all"
" connections are allowed."
},
+ { .key = {"rpc.outstanding-rpc-limit"},
+ .type = GF_OPTION_TYPE_INT,
+ .min = RPCSVC_MIN_OUTSTANDING_RPC_LIMIT,
+ .max = RPCSVC_MAX_OUTSTANDING_RPC_LIMIT,
+ .default_value = TOSTRING(RPCSVC_DEFAULT_OUTSTANDING_RPC_LIMIT),
+ .description = "Parameter to throttle the number of incoming RPC "
+ "requests from a client. 0 means no limit (can "
+ "potentially run out of memory)"
+ },
{ .key = {NULL} },
};