|
 |
9ae3f9 |
From 8e427716f4e2855093b1a1a0e3a9ec79ebac7faf Mon Sep 17 00:00:00 2001
|
|
|
9ae3f9 |
From: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
Date: Thu, 10 Sep 2020 13:49:09 +0530
|
|
|
9ae3f9 |
Subject: [PATCH 470/473] extras/snap_scheduler: changes in
|
|
|
9ae3f9 |
gluster-shared-storage mount path
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
The patch https://review.gluster.org/#/c/glusterfs/+/24934/, changes mount point
|
|
|
9ae3f9 |
of gluster_shared_storage from /var/run to /run to address the issue of symlink
|
|
|
9ae3f9 |
at mount path in fstab.
|
|
|
9ae3f9 |
NOTE: mount point /var/run is symlink to /run
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
The required changes with respect to gluster_shared_storage mount path are
|
|
|
9ae3f9 |
introduced with this patch in snap_scheduler.
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
>Fixes: #1476
|
|
|
9ae3f9 |
>Change-Id: I9ce88c2f624c6aa5982de04edfee2d0a9f160d62
|
|
|
9ae3f9 |
>Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
backport of https://review.gluster.org/#/c/glusterfs/+/24971/
|
|
|
9ae3f9 |
BUG: 1873469
|
|
|
9ae3f9 |
Change-Id: I9ce88c2f624c6aa5982de04edfee2d0a9f160d62
|
|
|
9ae3f9 |
Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/211391
|
|
|
9ae3f9 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
9ae3f9 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
9ae3f9 |
---
|
|
|
9ae3f9 |
extras/snap_scheduler/gcron.py | 4 ++--
|
|
|
9ae3f9 |
extras/snap_scheduler/snap_scheduler.py | 2 +-
|
|
|
9ae3f9 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/extras/snap_scheduler/gcron.py b/extras/snap_scheduler/gcron.py
|
|
|
9ae3f9 |
index cc16310..0e4df77 100755
|
|
|
9ae3f9 |
--- a/extras/snap_scheduler/gcron.py
|
|
|
9ae3f9 |
+++ b/extras/snap_scheduler/gcron.py
|
|
|
9ae3f9 |
@@ -19,10 +19,10 @@ import logging.handlers
|
|
|
9ae3f9 |
import fcntl
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
-GCRON_TASKS = "/var/run/gluster/shared_storage/snaps/glusterfs_snap_cron_tasks"
|
|
|
9ae3f9 |
+GCRON_TASKS = "/run/gluster/shared_storage/snaps/glusterfs_snap_cron_tasks"
|
|
|
9ae3f9 |
GCRON_CROND_TASK = "/etc/cron.d/glusterfs_snap_cron_tasks"
|
|
|
9ae3f9 |
GCRON_RELOAD_FLAG = "/var/run/gluster/crond_task_reload_flag"
|
|
|
9ae3f9 |
-LOCK_FILE_DIR = "/var/run/gluster/shared_storage/snaps/lock_files/"
|
|
|
9ae3f9 |
+LOCK_FILE_DIR = "/run/gluster/shared_storage/snaps/lock_files/"
|
|
|
9ae3f9 |
log = logging.getLogger("gcron-logger")
|
|
|
9ae3f9 |
start_time = 0.0
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/extras/snap_scheduler/snap_scheduler.py b/extras/snap_scheduler/snap_scheduler.py
|
|
|
9ae3f9 |
index 5a29d41..e8fcc44 100755
|
|
|
9ae3f9 |
--- a/extras/snap_scheduler/snap_scheduler.py
|
|
|
9ae3f9 |
+++ b/extras/snap_scheduler/snap_scheduler.py
|
|
|
9ae3f9 |
@@ -67,7 +67,7 @@ except ImportError:
|
|
|
9ae3f9 |
SCRIPT_NAME = "snap_scheduler"
|
|
|
9ae3f9 |
scheduler_enabled = False
|
|
|
9ae3f9 |
log = logging.getLogger(SCRIPT_NAME)
|
|
|
9ae3f9 |
-SHARED_STORAGE_DIR="/var/run/gluster/shared_storage"
|
|
|
9ae3f9 |
+SHARED_STORAGE_DIR="/run/gluster/shared_storage"
|
|
|
9ae3f9 |
GCRON_DISABLED = SHARED_STORAGE_DIR+"/snaps/gcron_disabled"
|
|
|
9ae3f9 |
GCRON_ENABLED = SHARED_STORAGE_DIR+"/snaps/gcron_enabled"
|
|
|
9ae3f9 |
GCRON_TASKS = SHARED_STORAGE_DIR+"/snaps/glusterfs_snap_cron_tasks"
|
|
|
9ae3f9 |
--
|
|
|
9ae3f9 |
1.8.3.1
|
|
|
9ae3f9 |
|