|
|
21ab4e |
From 716ec7f458d592c30f5ff8c667d04c5c1e014e62 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
Date: Fri, 9 Jun 2017 11:31:19 +0530
|
|
|
21ab4e |
Subject: [PATCH 504/509] nl-cache: add group volume set option for ease of use
|
|
|
21ab4e |
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/17495
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
21ab4e |
>Signed-off-by: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Id03643a9598da53051a01ca09e1d2a62bc195ab6
|
|
|
21ab4e |
BUG: 1460098
|
|
|
21ab4e |
Signed-off-by: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/108891
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
extras/Makefile.am | 4 +++-
|
|
|
21ab4e |
extras/group-nl-cache | 5 +++++
|
|
|
21ab4e |
glusterfs.spec.in | 5 +++++
|
|
|
21ab4e |
tests/basic/nl-cache.t | 9 ++++++---
|
|
|
21ab4e |
4 files changed, 19 insertions(+), 4 deletions(-)
|
|
|
21ab4e |
create mode 100644 extras/group-nl-cache
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/extras/Makefile.am b/extras/Makefile.am
|
|
|
21ab4e |
index e6964e6..96b1b2b 100644
|
|
|
21ab4e |
--- a/extras/Makefile.am
|
|
|
21ab4e |
+++ b/extras/Makefile.am
|
|
|
21ab4e |
@@ -9,7 +9,7 @@ SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
|
|
|
21ab4e |
|
|
|
21ab4e |
confdir = $(sysconfdir)/glusterfs
|
|
|
21ab4e |
conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \
|
|
|
21ab4e |
- logger.conf.example glusterfs-georep-logrotate group-virt.example group-metadata-cache group-gluster-block
|
|
|
21ab4e |
+ logger.conf.example glusterfs-georep-logrotate group-virt.example group-metadata-cache group-gluster-block group-nl-cache
|
|
|
21ab4e |
|
|
|
21ab4e |
voldir = $(sysconfdir)/glusterfs
|
|
|
21ab4e |
vol_DATA = glusterd.vol
|
|
|
21ab4e |
@@ -37,3 +37,5 @@ install-data-local:
|
|
|
21ab4e |
$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/metadata-cache
|
|
|
21ab4e |
$(INSTALL_DATA) $(top_srcdir)/extras/group-gluster-block \
|
|
|
21ab4e |
$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/gluster-block
|
|
|
21ab4e |
+ $(INSTALL_DATA) $(top_srcdir)/extras/group-nl-cache \
|
|
|
21ab4e |
+ $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/nl-cache
|
|
|
21ab4e |
diff --git a/extras/group-nl-cache b/extras/group-nl-cache
|
|
|
21ab4e |
new file mode 100644
|
|
|
21ab4e |
index 0000000..a41e8ec
|
|
|
21ab4e |
--- /dev/null
|
|
|
21ab4e |
+++ b/extras/group-nl-cache
|
|
|
21ab4e |
@@ -0,0 +1,5 @@
|
|
|
21ab4e |
+features.cache-invalidation=on
|
|
|
21ab4e |
+features.cache-invalidation-timeout=600
|
|
|
21ab4e |
+performance.nl-cache=on
|
|
|
21ab4e |
+performance.nl-cache-timeout=600
|
|
|
21ab4e |
+network.inode-lru-limit=50000
|
|
|
21ab4e |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
21ab4e |
index 20af5d2..1ce2d41 100644
|
|
|
21ab4e |
--- a/glusterfs.spec.in
|
|
|
21ab4e |
+++ b/glusterfs.spec.in
|
|
|
21ab4e |
@@ -1054,6 +1054,7 @@ exit 0
|
|
|
21ab4e |
%exclude %{_sysconfdir}/glusterfs/gluster-rsyslog-7.2.conf
|
|
|
21ab4e |
%exclude %{_sysconfdir}/glusterfs/group-virt.example
|
|
|
21ab4e |
%exclude %{_sysconfdir}/glusterfs/group-metadata-cache
|
|
|
21ab4e |
+%exclude %{_sysconfdir}/glusterfs/group-nl-cache
|
|
|
21ab4e |
%exclude %{_sysconfdir}/glusterfs/group-gluster-block
|
|
|
21ab4e |
%exclude %{_sysconfdir}/glusterfs/logger.conf.example
|
|
|
21ab4e |
%exclude %_init_glusterd
|
|
|
21ab4e |
@@ -1373,6 +1374,7 @@ exit 0
|
|
|
21ab4e |
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups
|
|
|
21ab4e |
%attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/virt
|
|
|
21ab4e |
%attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/metadata-cache
|
|
|
21ab4e |
+ %attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/nl-cache
|
|
|
21ab4e |
%attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/gluster-block
|
|
|
21ab4e |
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind
|
|
|
21ab4e |
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind/.keys
|
|
|
21ab4e |
@@ -2063,6 +2065,9 @@ end
|
|
|
21ab4e |
%endif
|
|
|
21ab4e |
|
|
|
21ab4e |
%changelog
|
|
|
21ab4e |
+* Tue Jun 13 2017 Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
+- Install /var/lib/glusterd/groups/nl-cache by default
|
|
|
21ab4e |
+
|
|
|
21ab4e |
* Wed May 10 2017 Pranith Kumar K <pkarampu@redhat.com>
|
|
|
21ab4e |
- Install /var/lib/glusterd/groups/gluster-block by default
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/tests/basic/nl-cache.t b/tests/basic/nl-cache.t
|
|
|
21ab4e |
index ddd4e25..f615328 100755
|
|
|
21ab4e |
--- a/tests/basic/nl-cache.t
|
|
|
21ab4e |
+++ b/tests/basic/nl-cache.t
|
|
|
21ab4e |
@@ -10,9 +10,12 @@ TEST glusterd
|
|
|
21ab4e |
TEST $CLI volume create $V0 $H0:$B0/${V0}{0..4}
|
|
|
21ab4e |
EXPECT 'Created' volinfo_field $V0 'Status'
|
|
|
21ab4e |
|
|
|
21ab4e |
-TEST $CLI volume set $V0 performance.nl-cache on
|
|
|
21ab4e |
-TEST $CLI volume set $V0 features.cache-invalidation on
|
|
|
21ab4e |
-TEST $CLI volume set $V0 features.cache-invalidation-timeout 600
|
|
|
21ab4e |
+TEST $CLI volume set $V0 group nl-cache
|
|
|
21ab4e |
+EXPECT '600' volinfo_field $V0 'performance.nl-cache-timeout'
|
|
|
21ab4e |
+EXPECT 'on' volinfo_field $V0 'performance.nl-cache'
|
|
|
21ab4e |
+EXPECT '600' volinfo_field $V0 'features.cache-invalidation-timeout'
|
|
|
21ab4e |
+EXPECT 'on' volinfo_field $V0 'features.cache-invalidation'
|
|
|
21ab4e |
+EXPECT '50000' volinfo_field $V0 'network.inode-lru-limit'
|
|
|
21ab4e |
|
|
|
21ab4e |
TEST $CLI volume start $V0;
|
|
|
21ab4e |
EXPECT 'Started' volinfo_field $V0 'Status';
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|