diff options
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/mount-shared-storage.sh | 43 | ||||
| -rw-r--r-- | extras/systemd/glusterfssharedstorage.service.in | 1 |
2 files changed, 22 insertions, 22 deletions
diff --git a/extras/mount-shared-storage.sh b/extras/mount-shared-storage.sh index 038a59aaabf..3645a0f42fd 100755 --- a/extras/mount-shared-storage.sh +++ b/extras/mount-shared-storage.sh @@ -4,34 +4,33 @@ #try to mount the shared storage if it fails #TODO : Do it for other glusterfs clients in /etc/fstab -ms="var-run-gluster-shared_storage.mount" volume="gluster_shared_storage" -failed=$(systemctl --failed | grep -c $ms) -if [ $failed -eq 1 ] +mp="/var/run/gluster/shared_storage" +#check if there is fstab entry for shared storage +gfc=$(sed -e 's/#.$//' </etc/fstab | grep -c $volume) +if [ $gfc -eq 0 ] then - if systemctl restart $ms - then - #Restart worked just wait for sometime to make it reflect - sleep 5 - else - #Restart failed, no point in further continuing - exit 1 - fi + exit 0 fi -# If we've reached this point, there wasn't a failed mountpoint -# BUT we need to check for whether this haven't been called before the attempts -# to the filesystem mounts, thus we need to check whether there is a glusterfs -# in fstab and aren't mountedmount +#check whether shared storage is mounted +#if it is mounted then mount has inode value 1 +inode=$(ls -id $mp | awk '{print $1}') -#In the logs I've seen ~4-5secs between the initial mount/start and the unmount +if [ $inode -eq 1 ] +then + exit 0 +fi -gfc=$(sed -e 's/#.$//' </etc/fstab | grep -c $volume) -gfm=$(grep -i $volume /proc/mounts | wc -l) +mount -t glusterfs localhost:/$volume $mp +#wait for few seconds +sleep 5 -if [ $gfm -lt $gfc ] +#recheck mount got succeed +inode=$(ls -id $mp | awk '{print $1}') +if [ $inode -eq 1 ] then - exit 1 + exit 0 +else + exit 1 fi - -exit 0 diff --git a/extras/systemd/glusterfssharedstorage.service.in b/extras/systemd/glusterfssharedstorage.service.in index 3bceba84215..723ff49afb7 100644 --- a/extras/systemd/glusterfssharedstorage.service.in +++ b/extras/systemd/glusterfssharedstorage.service.in @@ -3,6 +3,7 @@ Description=Mount glusterfs sharedstorage Requires=glusterd.service remote-fs-pre.target local-fs.target [Service] +Type=forking ExecStart=@GLUSTERFS_LIBEXECDIR@/mount-shared-storage.sh Restart=on-failure RestartSec=3 |