summaryrefslogtreecommitdiffstats
path: root/rpc/rpc-lib
diff options
context:
space:
mode:
authorSantosh Kumar Pradhan <spradhan@redhat.com>2013-11-21 17:13:58 +0530
committerVijay Bellur <vbellur@redhat.com>2013-11-25 05:40:57 -0800
commitb87d96b97d4a0cdc0883bec8ea8b4730b82fb3ba (patch)
treef972fcedd615f6c6acf81ed4edcf486bfa2d9881 /rpc/rpc-lib
parent07a3b04d5ce1d7a22a4ce01f1b6b8f8fc6ffbb05 (diff)
gNFS: More clean up for Gluster NFS
1) Fix the typo in NFS default ACL The typo was introduced as part of the Fix to BZ 1009210 i.e. http://review.gluster.org/5980. The user ACL xattr structure was passed to default ACL xattr. 2) Clean up NFS code to avoid unnecessary SEGV in rpcsvc_drc_reconfigure() which was not validating the svc->drc. Add a routine rpcsvc_drc_deinit() to handle the clean up of DRC specific data structures. For init(), use rpcsvc_drc_init(). 3) nfs_init_state() was returning wrong value even if the registration with portmapper failed, causing the NFS server process to hang around. As a result it used to get SEGV during rpcsvc_drc_reconfigure(). 4) Clean up memfactor usage across nfs.c nfs3.c. Change-Id: I5cea26cb68dd8a822ec0ae104952f67fe63fa703 BUG: 1009210 Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com> Reviewed-on: http://review.gluster.org/6329 Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'rpc/rpc-lib')
-rw-r--r--rpc/rpc-lib/src/rpc-drc.c104
-rw-r--r--rpc/rpc-lib/src/rpc-drc.h4
2 files changed, 69 insertions, 39 deletions
diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c
index 8181e6a..e7ba114 100644
--- a/rpc/rpc-lib/src/rpc-drc.c
+++ b/rpc/rpc-lib/src/rpc-drc.c
@@ -708,15 +708,10 @@ rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options)
uint32_t drc_size = 0;
uint32_t drc_factor = 0;
rpcsvc_drc_globals_t *drc = NULL;
- static gf_boolean_t drc_inited = _gf_false;
GF_ASSERT (svc);
GF_ASSERT (options);
- /* Already inited */
- if (drc_inited)
- return 0;
-
if (!svc->drc) {
drc = GF_CALLOC (1, sizeof (rpcsvc_drc_globals_t),
gf_common_mt_drc_globals_t);
@@ -742,11 +737,10 @@ rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options)
gf_log (GF_RPCSVC, GF_LOG_INFO, "drc user options need second look");
ret = _gf_true;
}
- drc->enable_drc = ret;
if (ret == _gf_false) {
/* drc off */
- gf_log (GF_RPCSVC, GF_LOG_DEBUG, "DRC is off");
+ gf_log (GF_RPCSVC, GF_LOG_INFO, "DRC is manually turned OFF");
ret = 0;
goto out;
}
@@ -802,8 +796,6 @@ rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options)
gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc init successful");
drc->status = DRC_INITIATED;
- drc_inited = _gf_true;
-
out:
UNLOCK (&drc->lock);
if (ret == -1) {
@@ -818,6 +810,32 @@ rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options)
}
int
+rpcsvc_drc_deinit (rpcsvc_t *svc)
+{
+ rpcsvc_drc_globals_t *drc = NULL;
+
+ if (!svc)
+ return (-1);
+
+ drc = svc->drc;
+ if (!drc)
+ return (0);
+
+ LOCK (&drc->lock);
+ (void) rpcsvc_unregister_notify (svc, rpcsvc_drc_notify, THIS);
+ if (drc->mempool) {
+ mem_pool_destroy (drc->mempool);
+ drc->mempool = NULL;
+ }
+ UNLOCK (&drc->lock);
+
+ GF_FREE (drc);
+ svc->drc = NULL;
+
+ return (0);
+}
+
+int
rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options)
{
int ret = -1;
@@ -825,48 +843,58 @@ rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options)
rpcsvc_drc_globals_t *drc = NULL;
uint32_t drc_size = 0;
+ /* Input sanitization */
if ((!svc) || (!options))
return (-1);
+ /* If DRC was not enabled before, Let rpcsvc_drc_init() to
+ * take care of DRC initialization part.
+ */
drc = svc->drc;
- /* reconfig for drc-size */
- if (dict_get_uint32 (options, "nfs.drc-size", &drc_size))
- drc_size = DRC_DEFAULT_CACHE_SIZE;
-
- if (drc->global_cache_size != drc_size) {
- gf_log (GF_RPCSVC, GF_LOG_DEBUG, "nfs.drc-size size can not "
- "be reconfigured without NFS server restart.");
- return (-1);
+ if (!drc) {
+ return rpcsvc_drc_init(svc, options);
}
- /* reconfig for nfs.drc */
+ /* DRC was already enabled before. Going to be reconfigured. Check
+ * if reconfigured options contain "nfs.drc" and "nfs.drc-size".
+ *
+ * NB: If DRC is "OFF", "drc-size" has no role to play.
+ * So, "drc-size" gets evaluated IFF DRC is "ON".
+ *
+ * If DRC is reconfigured,
+ * case 1: DRC is "ON"
+ * sub-case 1: drc-size remains same
+ * ACTION: Nothing to do.
+ * sub-case 2: drc-size just changed
+ * ACTION: rpcsvc_drc_deinit() followed by
+ * rpcsvc_drc_init().
+ *
+ * case 2: DRC is "OFF"
+ * ACTION: rpcsvc_drc_deinit()
+ */
ret = dict_get_str_boolean (options, "nfs.drc", _gf_true);
if (ret < 0) {
- ret = _gf_true;
+ enable_drc = _gf_true;
+ } else {
+ enable_drc = ret;
}
- enable_drc = ret;
-
- if (drc->enable_drc == enable_drc)
- return 0;
- drc->enable_drc = enable_drc;
+ /* case 1: DRC is "ON"*/
if (enable_drc) {
- if (drc == NULL)
- return rpcsvc_drc_init(svc, options);
- } else {
- if (drc == NULL)
+ /* Fetch drc-size if reconfigured */
+ if (dict_get_uint32 (options, "nfs.drc-size", &drc_size))
+ drc_size = DRC_DEFAULT_CACHE_SIZE;
+
+ /* case 1: sub-case 1*/
+ if (drc->global_cache_size == drc_size)
return (0);
- LOCK (&drc->lock);
- (void) rpcsvc_unregister_notify (svc, rpcsvc_drc_notify, THIS);
- if (drc->mempool) {
- mem_pool_destroy (drc->mempool);
- drc->mempool = NULL;
- }
- UNLOCK (&drc->lock);
- GF_FREE (drc);
- svc->drc = NULL;
+ /* case 1: sub-case 2*/
+ (void) rpcsvc_drc_deinit (svc);
+ return rpcsvc_drc_init (svc, options);
}
- return (0);
+ /* case 2: DRC is "OFF" */
+ gf_log (GF_RPCSVC, GF_LOG_INFO, "DRC is manually turned OFF");
+ return rpcsvc_drc_deinit (svc);
}
diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h
index 7dfaef9..c42c2a2 100644
--- a/rpc/rpc-lib/src/rpc-drc.h
+++ b/rpc/rpc-lib/src/rpc-drc.h
@@ -71,7 +71,6 @@ struct drc_globals {
struct list_head cache_head;
uint32_t client_count;
struct list_head clients_head;
- gf_boolean_t enable_drc;
};
int
@@ -99,6 +98,9 @@ int
rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options);
int
+rpcsvc_drc_deinit (rpcsvc_t *svc);
+
+int
rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options);
#endif /* RPC_DRC_H */