Change in vdsm[master]: gluster: add gluster heal info verb
Darshan N has posted comments on this change. Change subject: gluster: add gluster heal info verb .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/56738 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie37b042d92115897b19cb7fc07dbf5d6b0bf038f Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ramesh N Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: add gluster heal info verb
Darshan N has posted comments on this change.
Change subject: gluster: add gluster heal info verb
..
Patch Set 5:
(3 comments)
https://gerrit.ovirt.org/#/c/56738/5/client/vdsClientGluster.py
File client/vdsClientGluster.py:
PS5, Line 751: remoteServer = params.get('remoteServer', '')
you don't seem to be using remote-server anywhere
https://gerrit.ovirt.org/#/c/56738/5/lib/api/vdsmapi-gluster-schema.json
File lib/api/vdsmapi-gluster-schema.json:
PS5, Line 2215: 'command': {'class': 'GlusterVolume', 'name': 'healInfo'},
: 'data': {'volumeName': 'str'}}
you will have to add "returns".
https://gerrit.ovirt.org/#/c/56738/5/vdsm/gluster/cli.py
File vdsm/gluster/cli.py:
PS5, Line 1591: return _parseVolumeHealInfo(xmltree)
can you have another try except block for this call. Because if this fails it
wont raise glustercommandfailedexception, instead etreeexception is raised.
--
To view, visit https://gerrit.ovirt.org/56738
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie37b042d92115897b19cb7fc07dbf5d6b0bf038f
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ramesh N
Gerrit-Reviewer: Darshan N
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sahina Bose
Gerrit-Reviewer: gerrit-hooks
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix schema
Darshan N has posted comments on this change. Change subject: gluster: fix schema .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/54065 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I070c9cd7509918a58cc70d4e66dae68b7d8cae0f Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix schema
Darshan N has posted comments on this change.
Change subject: gluster: fix schema
..
Patch Set 1:
(4 comments)
Sorry, for the delayed response.
https://gerrit.ovirt.org/#/c/54065/1/lib/api/vdsmapi-gluster-schema.json
File lib/api/vdsmapi-gluster-schema.json:
Line 451: TaskType
> Where is this type defined?
I think it was missed, could you please add:
##
# @TaskType:
#
# Possible value of task type.
#
# @REBALANCE: Task type is rebalance
#
# @REPLACE_BRICK: Task type is replace brick
#
# @REMOVE_BRICK: Task type is remove brick
#
# Since: 4.10.3
##
{'enum': 'TaskType',
'data': ['REBALANCE', 'REPLACE_BRICK','REMOVE_BRICK']}
Line 1455: ##
Line 1456: # @GlusterGeoRepSessionList:
Line 1457: #
Line 1458: # Gluster geo-replication session list.
Line 1459: #
> @Darshan, is the volumeName an optional parameter here?
It was there by mistake. volumeName is not needed here.
Line 1460: # @sessions: The session details of all sessions
Line 1461: #
Line 1462: # Since: 4.17.0
Line 1463: ##
Line 2095: writeGeoRepPubKeysUpdate
geoRepKeysUpdate
Line 2105: writeGeoRepPubKeysUpdate
geoRepKeysUpdate
--
To view, visit https://gerrit.ovirt.org/54065
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I070c9cd7509918a58cc70d4e66dae68b7d8cae0f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Darshan N
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Ramesh N
Gerrit-Reviewer: Sahina Bose
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: gerrit-hooks
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Publish gluster get volume info
Darshan N has posted comments on this change. Change subject: gluster: Publish gluster get volume info .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/45098 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9c70e9afa2fd776dfd9c2767c2e83e7f179b5c2 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Darshan Narayana Murthy Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: handle an unhandled exception in gfapi.py
Darshan N has posted comments on this change. Change subject: gluster: handle an unhandled exception in gfapi.py .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/43670 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I222345801e8d33ef17f0ae5ca66b1d34fa80d95b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: handle an unhandled exception in gfapi.py
Darshan N has uploaded a new change for review.
Change subject: gluster: handle an unhandled exception in gfapi.py
..
gluster: handle an unhandled exception in gfapi.py
This patch handles an un handled exception in gfapi.py
which is related to gluster libgfapi. This exception was
seen when glusterVolumsStatsInfo and glusterVolumeStatus
verbs were invoked. Now this has been handled properly.
Change-Id: I222345801e8d33ef17f0ae5ca66b1d34fa80d95b
Signed-off-by: Darshan N
---
M vdsm/gluster/gfapi.py
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/43670/1
diff --git a/vdsm/gluster/gfapi.py b/vdsm/gluster/gfapi.py
index ef0e863..e5105fc 100644
--- a/vdsm/gluster/gfapi.py
+++ b/vdsm/gluster/gfapi.py
@@ -285,8 +285,12 @@
if __name__ == '__main__':
args = parse_cmdargs()
if args.command.upper() == 'STATVFS':
-res = volumeStatvfsGet(args.volume, args.host,
- int(args.port), args.protocol)
+try:
+res = volumeStatvfsGet(args.volume, args.host,
+ int(args.port), args.protocol)
+except ge.GlusterException as e:
+sys.stderr.write(str(e))
+sys.exit(1)
json.dump({'f_blocks': res.f_blocks, 'f_bfree': res.f_bfree,
'f_bsize': res.f_bsize, 'f_frsize': res.f_frsize,
'f_bavail': res.f_bavail, 'f_files': res.f_files,
--
To view, visit https://gerrit.ovirt.org/43670
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I222345801e8d33ef17f0ae5ca66b1d34fa80d95b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Darshan N
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: run restorecon for files created during geo-rep cre...
Darshan N has posted comments on this change. Change subject: gluster: run restorecon for files created during geo-rep create. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42913 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: run restorecon for files created during geo-rep cre...
Hello Piotr Kliczewski, Bala.FA, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42913 to review the following change. Change subject: gluster: run restorecon for files created during geo-rep create. .. gluster: run restorecon for files created during geo-rep create. This patch runs restorecon on ssh directory and authorized_keys file if they are created as part of geoRepKeysUpdate verb. This is used by geo replication feature. When selinux is enabled, without this fix ssh between master and slave nodes fail. Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1230353 Signed-off-by: Darshan N Reviewed-on: https://gerrit.ovirt.org/42804 Continuous-Integration: Jenkins CI Reviewed-by: Bala.FA Reviewed-by: Piotr Kliczewski Reviewed-by: Dan Kenigsberg --- M vdsm/gluster/api.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/42913/1 diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index c007b28..0c5829f 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -21,6 +21,7 @@ import errno import fcntl import os +import selinux from functools import wraps from vdsm.define import doneCode from vdsm import constants, utils @@ -129,6 +130,8 @@ try: os.makedirs(sshDir, 0700) os.chown(sshDir, uid, gid) +if selinux.is_selinux_enabled(): +selinux.restorecon(sshDir) except OSError as e: raise ge.GlusterGeoRepPublicKeyWriteFailedException(err=[str(e)]) @@ -155,7 +158,9 @@ safeWrite(authKeysFile, ''.join(outLines)) os.chmod(authKeysFile, 0600) os.chown(authKeysFile, uid, gid) -except IOError as e: +if selinux.is_selinux_enabled(): +selinux.restorecon(authKeysFile) +except (IOError, OSError) as e: raise ge.GlusterGeoRepPublicKeyWriteFailedException(err=[str(e)]) -- To view, visit https://gerrit.ovirt.org/42913 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Piotr Kliczewski ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: run restorecon for files created during geo-rep cre...
Darshan N has posted comments on this change. Change subject: gluster: run restorecon for files created during geo-rep create. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42804 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: run restorecon for files created during geo-rep cre...
Darshan N has uploaded a new change for review. Change subject: gluster: run restorecon for files created during geo-rep create. .. gluster: run restorecon for files created during geo-rep create. This patch runs restorecon on ssh directory and authorized_keys file if they are created as part of geoRepKeysUpdate verb. This is used by geo replication feature. When selinux is enabled, without this fix ssh between master and slave nodes fail. Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1230353 Signed-off-by: Darshan N --- M vdsm/gluster/api.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/42804/1 diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 24b8230..781ab77 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -21,6 +21,7 @@ import errno import fcntl import os +import selinux from functools import wraps from vdsm.define import doneCode from vdsm import constants, utils @@ -129,6 +130,8 @@ try: os.makedirs(sshDir, 0o700) os.chown(sshDir, uid, gid) +if selinux.is_selinux_enabled(): +selinux.restorecon(sshDir) except OSError as e: raise ge.GlusterGeoRepPublicKeyWriteFailedException(err=[str(e)]) @@ -155,7 +158,9 @@ safeWrite(authKeysFile, ''.join(outLines)) os.chmod(authKeysFile, 0o600) os.chown(authKeysFile, uid, gid) -except IOError as e: +if selinux.is_selinux_enabled(): +selinux.restorecon(authKeysFile) +except (IOError, OSError) as e: raise ge.GlusterGeoRepPublicKeyWriteFailedException(err=[str(e)]) -- To view, visit https://gerrit.ovirt.org/42804 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23a9bb5dfd2e22f91a796635a3192ca617b69632 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: WIP:gluster: new verb to provide gluster self-heal info.
Darshan N has uploaded a new change for review.
Change subject: WIP:gluster: new verb to provide gluster self-heal info.
..
WIP:gluster: new verb to provide gluster self-heal info.
This patch adds a new verb "glusterVolumeHealInfo". This
verb takes volume name as an argument. It returns gluster
self heal related information. the sample return value
is as follows:
{'volumeName': {'brick1':
{'totalFileCount': 'number of files to be healed',
'splitBrainFlieCount': 'number of files in'
'split-brain state'}
'brick2':
{'totalFileCount': 'number of files to be healed',
'splitBrainFlieCount': 'number of files in'
'split-brain state'}
}
}
Note: gluster does not provide xml output for self-heal info
yet. Waiting for BZ#1063506 to be fixed. This patch is sent
asuming the probable xml output provided by gluster.
Change-Id: I28d6c9e1a95e6ddc1d89ea9e17873f6865681d56
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1205641
Signed-off-by: Darshan N
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/cli.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 113 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/42720/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index a4bce63..82971f3 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -740,6 +740,15 @@
pp.pprint(status)
return status['status']['code'], status['status']['message']
+def do_glusterVolumeHealInfo(self, args):
+params = self._eqSplit(args)
+volumeName = params.get('volumeName', '')
+
+status = self.s.glusterVolumeHealInfo(volumeName)
+
+pp.pprint(status)
+return status['status']['code'], status['status']['message']
+
def getGlusterCmdDict(serv):
return \
@@ -1252,5 +1261,10 @@
serv.do_glusterSnapshotScheduleReset,
('',
'Reset gluster snapshot scheduling'
+ )),
+ 'glusterVolumeHealInfo': (
+ serv.do_glusterVolumeHealInfo,
+ ('volumeName=',
+ 'get gluster volume self-heal information'
))
}
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 24b8230..1299a4a 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -747,6 +747,11 @@
def snapshotScheduleReset(self, options=None):
self.svdsmProxy.glusterSnapshotScheduleFlagUpdate("none")
+@exportAsVerb
+def volumeHealInfo(self, volumeName=None, options=None):
+status = self.svdsmProxy.glusterVolumeInfo(volumeName)
+return {'healInfo': status}
+
def getGlusterMethods(gluster):
l = []
diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py
index 4768a86..17d5121 100644
--- a/vdsm/gluster/apiwrapper.py
+++ b/vdsm/gluster/apiwrapper.py
@@ -320,6 +320,9 @@
def snapshotScheduleReset(self):
return self._gluster.snapshotScheduleReset()
+def volumeHealInfo(self, volumeName):
+return self._gluster.volumeHealInfo(volumeName)
+
class GlusterSnapshot(GlusterApiBase):
def __init__(self):
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index d53a1c8..9e22dd0 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -1576,3 +1576,39 @@
return True
except ge.GlusterCmdFailedException as e:
raise ge.GlusterGeoRepSessionDeleteFailedException(rc=e.rc, err=e.err)
+
+
+def _parseVolumeHealInfo(tree):
+"""
+{'volumeName': {'brick1':
+{'totalFileCount': 'number of files to be healed',
+ 'splitBrainFlieCount': 'number of files in'
+'split-brain state'}
+'brick2':
+{'totalFileCount': 'number of files to be healed',
+ 'splitBrainFlieCount': 'number of files in'
+'split-brain state'}
+ }
+}
+"""
+bricks = {}
+for el in tree.findall('healInfo/volume/bricks/brick'):
+value = {}
+value['totalFileCount'] = el.find('numberOfEntries').text
+value['splitBrainFileCount'] = el.find(
+'numberOfSplitBrainEntries').text
+bricks.update({el.find('name').text: value})
+return {tree.find('healInfo/volume/name').text: bricks}
+
+
+@makePublic
+def volumeHealInfo(volumeName):
+command = _getGlusterVolCmd() + ["heal", volumeName, "info"]
+try:
+xmltree = _execGlusterXml(command)
+except ge.GlusterCmdFailedException as e:
+raise ge.GlusterVolumeHealInfoFailedEx
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change. Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 12: This patch has to go in before patch: https://gerrit.ovirt.org/#/c/41858/. Earlier this patch was dependent on above mentioned patch. In this patch set have removed that. -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change. Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 12: Verified+1 -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change.
Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg
..
Patch Set 11:
(1 comment)
https://gerrit.ovirt.org/#/c/41568/11/vdsm.spec.in
File vdsm.spec.in:
Line 279: %endif # rhel
Line 280:
Line 281: # GlusterFS client-side RPMs needed for Gluster SD
Line 282: Requires: glusterfs-cli >= %{gluster_version}
Line 283: Requires: glusterfs-fuse >= %{gluster_version}
> Doesn't Gluster SD feature require glusterfs-api as well?
AFAIK glusterfs-api is not needed by gluster SD.
Nir Soffer,
Can you please confirm about this.
Line 284:
Line 285: Requires: psmisc >= 22.6-15
Line 286: Requires: bridge-utils
Line 287: Requires: sos
--
To view, visit https://gerrit.ovirt.org/41568
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Adam Litke
Gerrit-Reviewer: Ala Hino
Gerrit-Reviewer: Allon Mureinik
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Darshan N
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: Sahina Bose
Gerrit-Reviewer: Timothy Asir
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change. Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 9: (1 comment) https://gerrit.ovirt.org/#/c/41568/9/vdsm.spec.in File vdsm.spec.in: Line 280 Line 281 Line 282 Line 283 Line 284 > We don't need glusterfs-rdma at all anymore? no, its not needed by vdsm. -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change. Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 9: Verified+1 Have verified that vdsm package is no longer dependent on glusterfs-server package. And vdsm-gluster sub package is dependent on glusterfs-server package. Also gluster related verbs are working fine. Can somebody also verify, if things are working fine in storage domain perspective. -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Remove Vdsm's dependency on glusterfs-server pkg
Darshan N has posted comments on this change. Change subject: gluster: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 8: (3 comments) https://gerrit.ovirt.org/#/c/41568/8//COMMIT_MSG Commit Message: Line 7: refactor > you need to change the heading properly. Done https://gerrit.ovirt.org/#/c/41568/8/vdsm.spec.in File vdsm.spec.in: Line 283: with_gluster > is this still valid here? Done Line 641: replication > please define gluster_version prior and use it everywhere Done -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster:refactor: Remove Vdsm's dependency on glusterfs-serv...
Darshan N has posted comments on this change. Change subject: gluster:refactor: Remove Vdsm's dependency on glusterfs-server pkg .. Patch Set 8: Was under the impression that cli.py file that registers glusterVolumeInfo method to supervdsm is part of gluster-server sub package. But it actually is part of vdsm package, so no code refactoring needed. -- To view, visit https://gerrit.ovirt.org/41568 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Allow gluster mount with additional servers
Darshan N has posted comments on this change. Change subject: gluster: Allow gluster mount with additional servers .. Patch Set 19: (1 comment) https://gerrit.ovirt.org/#/c/40665/19/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 303: volInfo = supervdsm.getProxy().glusterVolumeInfo(volname, This call might raise some exception. can it be handled suitably? -- To view, visit https://gerrit.ovirt.org/40665 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2478a5edc1fc9d24eb96d64a32a98a2467ce2989 Gerrit-PatchSet: 19 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: add xfsprogs as dependency to gluster sub-package
Darshan N has posted comments on this change. Change subject: gluster: add xfsprogs as dependency to gluster sub-package .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42364 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: refresh lvm devices after brick create
Darshan N has posted comments on this change. Change subject: gluster: refresh lvm devices after brick create .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42365 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a6a10a2746c6f44a16de41c153ce46460d37b7f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: handle partition table corruption error
Darshan N has posted comments on this change. Change subject: gluster: handle partition table corruption error .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42350 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb3d42091b69f052ae93bbb114f9d3b9d158be4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix vg create failed first time during brick create
Darshan N has posted comments on this change. Change subject: gluster: fix vg create failed first time during brick create .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42363 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf558aab450d6c4546c34e9439249c44e930a304 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: tests: fix redefinition pyflakes error
Darshan N has posted comments on this change. Change subject: tests: fix redefinition pyflakes error .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42349 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I244dfbc031a4c10f1938d3f5a07daed757011d16 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: refresh lvm devices after brick create
Hello Timothy Asir, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42365
to review the following change.
Change subject: gluster: refresh lvm devices after brick create
..
gluster: refresh lvm devices after brick create
Issue:
Brick create function in vdsm gluster module which creates lvm
devices like pv, vg, thinlv and format the lv and mount it
using python-blivet. In the brick creation process, the created
vgs are not visible to lvm vgs command and the lvm devices and
its details are not available or not listed by devices list
function.
Cause:
On every successful brick creation the thin lv mount details
will be updated into fstab entry to get the devices mounted
automatically on reboot.
Because of this visibility issue with lvm devices, the thin lvs
which are mounted during brick create process are not getting
mounted automatically on any number of reboot. The Blocking bug
filed in https://bugzilla.redhat.com/show_bug.cgi?id=1227788
Observations:
This issue is observed in any plain RHEL6.6 or RHEL6.7 node
with the latest kernel (2.6.32-567.el6.x86_64) and python-
blivet installed with or without vdsm installed in the node.
This issue identified in the rhel system where it has the
default lvm configuration.
Findings:
According to LVM2 man page documentation, vgscan should
take place automatically and the manuel vgscan required only
when there is any hardware change. The created vg details should
be updated automatically. But it fails here some how. This shows
that, this is absolutely an lvm issue. We have to run pvscan
or vgscan to make lvm see vgs or lvs. Bug for lvm filed in
https://bugzilla.redhat.com/show_bug.cgi?id=1230495
However there may be a little chances for blivet could cause
this issue by passing some causing arguments to lvm. Blivet team
is working on this to verify this.
This issue never observed on any reboots or brick creates;
when we execute a lvm pvs command or vgscan command at-least
once afer any first brick create.
Fix:
This patch refresh lvm devices after brick create
by running vgscan. This is a workaround patch and this
will be removed once the lvm bz#1230495 is fixed.
Kindly refer the bugs for any further details or logs.
Change-Id: I6a6a10a2746c6f44a16de41c153ce46460d37b7f
Signed-off-by: Timothy Asir Jeyasingh
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1227742
Bug-Url: https://bugzilla.redhat.com/1227788
Signed-off-by: Timothy Asir Jeyasingh
Reviewed-on: https://gerrit.ovirt.org/42142
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg
---
M vdsm/gluster/exception.py
M vdsm/gluster/storagedev.py
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/42365/1
diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py
index f95d749..17ad018 100644
--- a/vdsm/gluster/exception.py
+++ b/vdsm/gluster/exception.py
@@ -453,6 +453,11 @@
"stripe size %s" % (name, devices, stripeSize)
+class GlusterHostStorageDeviceVGScanFailedException(GlusterHostException):
+code = 4519
+message = "vgscan failed"
+
+
# Hook
class GlusterHookException(GlusterException):
code = 4500
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index 0339d5f..eb8b103 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -50,6 +50,9 @@
_lvchangeCommandPath = utils.CommandPath("lvchange",
"/sbin/lvchange",
"/usr/sbin/lvchange",)
+_vgscanCommandPath = utils.CommandPath("vgscan",
+ "/sbin/vgscan",
+ "/usr/sbin/vgscan",)
# All size are in MiB unless otherwise specified
DEFAULT_CHUNK_SIZE_KB = 256
@@ -317,5 +320,11 @@
err=[errMsg])
thinlv.format.setup(mountpoint=mountPoint)
blivetEnv.doIt()
+
+# bz#1230495: lvm devices are invisible and appears only after vgscan
+# Workaround: Till the bz gets fixed, We use vgscan to refresh LVM devices
+rc, out, err = utils.execCmd([_vgscanCommandPath.cmd])
+if rc:
+raise ge.GlusterHostStorageDeviceVGScanFailedException(rc, out, err)
fstab.FsTab().add(thinlv.path, mountPoint, DEFAULT_FS_TYPE)
return _getDeviceDict(thinlv)
--
To view, visit https://gerrit.ovirt.org/42365
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a6a10a2746c6f44a16de41c153ce46460d37b7f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: add xfsprogs as dependency to gluster sub-package
Hello Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42364
to review the following change.
Change subject: gluster: add xfsprogs as dependency to gluster sub-package
..
gluster: add xfsprogs as dependency to gluster sub-package
As glusterBrickCreate verb uses xfs filesystem as default, this patch
add xfsprogs package as dependency.
Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1231210
Signed-off-by: Bala.FA
Reviewed-on: https://gerrit.ovirt.org/42301
Continuous-Integration: Jenkins CI
Reviewed-by: Timothy Asir
Tested-by: Timothy Asir
Reviewed-by: Darshan N
Reviewed-by: Dan Kenigsberg
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/42364/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index b2a514a..eb0d3b1 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -683,6 +683,7 @@
%if 0%{?rhel} > 6 || 0%{?fedora}
Requires: python-blivet
%endif
+Requires: xfsprogs
%description gluster
Gluster plugin enables VDSM to serve Gluster functionalities.
--
To view, visit https://gerrit.ovirt.org/42364
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix vg create failed first time during brick create
Hello Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42363
to review the following change.
Change subject: gluster: fix vg create failed first time during brick create
..
gluster: fix vg create failed first time during brick create
Currently brick create uses vdsm lvm module for pv create and
blivet to create a vg. This issue not occured if both pv and vg
are created using blivet itself.
But unfortunately blivet has few issues while creating a vg.
Its able to create a vg with a pesize of minimum 1mb only.
Also the vdsm lvm module has some issue while creating a vg.
So this path uses lvm vgcreate command to create the vg
as a workaround.
Change-Id: Ibf558aab450d6c4546c34e9439249c44e930a304
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1226186
Signed-off-by: Timothy Asir Jeyasingh
Reviewed-on: https://gerrit.ovirt.org/41392
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
---
M vdsm/gluster/exception.py
M vdsm/gluster/storagedev.py
2 files changed, 28 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/42363/1
diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py
index fb18177..f95d749 100644
--- a/vdsm/gluster/exception.py
+++ b/vdsm/gluster/exception.py
@@ -440,6 +440,19 @@
self.message = "Mount point %s is in use" % mountPoint
+class GlusterHostStorageDeviceVGCreateFailedException(GlusterHostException):
+code = 4518
+
+def __init__(self, name=None, devices=None,
+ stripeSize=None, rc=0, out=(), err=()):
+GlusterHostException.__init__(self)
+self.rc = rc
+self.out = out
+self.err = err
+self.message = "Failed to create LVM VG:%s for devices %s with " \
+ "stripe size %s" % (name, devices, stripeSize)
+
+
# Hook
class GlusterHookException(GlusterException):
code = 4500
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index 2aeabad..0339d5f 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -41,6 +41,9 @@
log = logging.getLogger("Gluster")
+_vgCreateCommandPath = utils.CommandPath("vgcreate",
+ "/sbin/vgcreate",
+ "/usr/sbin/vgcreate",)
_lvconvertCommandPath = utils.CommandPath("lvconvert",
"/sbin/lvconvert",
"/usr/sbin/lvconvert",)
@@ -172,13 +175,20 @@
def _createVG(vgName, deviceList, stripeSize=0):
if stripeSize:
-vg = LVMVolumeGroupDevice(
-vgName, peSize=blivet.size.Size('%s KiB' % stripeSize),
-parents=deviceList)
+# bz#1198568: Blivet always creates vg with 1MB stripe size
+# Workaround: Till blivet fixes the issue, use vgcreate command
+devices = ','.join([device.path for device in deviceList])
+rc, out, err = utils.execCmd([_vgCreateCommandPath.cmd,
+ '-s', '%sk' % stripeSize,
+ vgName, devices])
+if rc:
+raise ge.GlusterHostStorageDeviceVGCreateFailedException(
+vgName, devices, stripeSize, rc, out, err)
+blivetEnv.reset()
+vg = blivetEnv.devicetree.getDeviceByName(vgName)
else:
vg = LVMVolumeGroupDevice(vgName, parents=deviceList)
-
-blivetEnv.createDevice(vg)
+blivetEnv.createDevice(vg)
return vg
def _createThinPool(poolName, vg, alignment=0,
--
To view, visit https://gerrit.ovirt.org/42363
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf558aab450d6c4546c34e9439249c44e930a304
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: handle partition table corruption error
Hello Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42350
to review the following change.
Change subject: gluster: handle partition table corruption error
..
gluster: handle partition table corruption error
Currently vdsm throws an exception if there is any corruption
in the partitition entry of any device and returns an error
for devices list and create brick. This path fixes this issue
by just loggin the issue and continue with remaining devices.
Change-Id: Iaeb3d42091b69f052ae93bbb114f9d3b9d158be4
Signed-off-by: Timothy Asir Jeyasingh
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1227781
Signed-off-by: Timothy Asir Jeyasingh
Reviewed-on: https://gerrit.ovirt.org/42210
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
---
M vdsm/gluster/storagedev.py
1 file changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/42350/1
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index 583548b..2aeabad 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -107,10 +107,18 @@
return True
+def _reset_blivet(blivetEnv):
+try:
+blivetEnv.reset()
+except (blivet.errors.UnusableConfigurationError,
+blivet.errors.StorageError) as e:
+log.error("Error: %s" % e.message)
+
+
@makePublic
def storageDevicesList():
blivetEnv = blivet.Blivet()
-blivetEnv.reset()
+_reset_blivet(blivetEnv)
return _parseDevices(blivetEnv.devices)
@@ -148,8 +156,7 @@
if rc:
raise ge.GlusterHostStorageDevicePVCreateFailedException(
dev.path, alignment, rc, out, err)
-
-blivetEnv.reset()
+_reset_blivet(blivetEnv)
return _getDeviceList([dev.name for dev in deviceList])
if alignment:
@@ -218,8 +225,7 @@
if rc:
raise ge.GlusterHostStorageDeviceLVChangeFailedException(
vgPoolName, rc, out, err)
-
-blivetEnv.reset()
+_reset_blivet(blivetEnv)
return blivetEnv.devicetree.getDeviceByName(poolLv.name)
if os.path.ismount(mountPoint):
@@ -242,7 +248,7 @@
chunkSize = DEFAULT_CHUNK_SIZE_KB
blivetEnv = blivet.Blivet()
-blivetEnv.reset()
+_reset_blivet(blivetEnv)
deviceList = _getDeviceList(devNameList)
--
To view, visit https://gerrit.ovirt.org/42350
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeb3d42091b69f052ae93bbb114f9d3b9d158be4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: tests: fix redefinition pyflakes error
Hello Piotr Kliczewski, Nir Soffer, Timothy Asir, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42349 to review the following change. Change subject: tests: fix redefinition pyflakes error .. tests: fix redefinition pyflakes error The build fails with the following error in pyflakes version "0.7.3-4" installed. ./tests/functional/networkTests.py:93: redefinition of unused 'vdsm' from line 28 ./tests/functional/networkTests.py:101: redefinition of unused 'vdsm' from line 28 make[1]: *** [pyflakes] Error 1 Change-Id: I244dfbc031a4c10f1938d3f5a07daed757011d16 Signed-off-by: Timothy Asir Jeyasingh Reviewed-on: https://gerrit.ovirt.org/41402 Continuous-Integration: Jenkins CI Reviewed-by: Nir Soffer Reviewed-by: Piotr Kliczewski Reviewed-by: Dan Kenigsberg --- M tests/functional/networkTests.py 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/42349/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 075fac4..6290a56 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -76,16 +76,14 @@ def setupModule(): """Persists network configuration.""" -vdsm = VdsProxy() -vdsm.save_config() +VdsProxy().save_config() for _ in range(DUMMY_POOL_SIZE): dummyPool.add(dummy.create()) def tearDownModule(): """Restores the network configuration previous to running tests.""" -vdsm = VdsProxy() -vdsm.restoreNetConfig() +VdsProxy().restoreNetConfig() for nic in dummyPool: dummy.remove(nic) -- To view, visit https://gerrit.ovirt.org/42349 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I244dfbc031a4c10f1938d3f5a07daed757011d16 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: add xfsprogs as dependency to gluster sub-package
Darshan N has posted comments on this change. Change subject: gluster: add xfsprogs as dependency to gluster sub-package .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/42301/2/vdsm.spec.in File vdsm.spec.in: Line 648: xfsprogs > Its added that way. gluster sub-package gives only api and the sub-package okay -- To view, visit https://gerrit.ovirt.org/42301 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: add xfsprogs as dependency to gluster sub-package
Darshan N has posted comments on this change. Change subject: gluster: add xfsprogs as dependency to gluster sub-package .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42301 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: add xfsprogs as dependency to gluster sub-package
Darshan N has posted comments on this change. Change subject: gluster: add xfsprogs as dependency to gluster sub-package .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/42301/2/vdsm.spec.in File vdsm.spec.in: Line 648: xfsprogs would it be better if we add this dependency only with_gluster, as its used only by gluster specific verb ? -- To view, visit https://gerrit.ovirt.org/42301 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8823e9a5e1c84af8c3afdf1fc5a26e04b4be831b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: WIP: Remove Vdsm's dependency on gluster-server package.
Darshan N has posted comments on this change.
Change subject: WIP: Remove Vdsm's dependency on gluster-server package.
..
Patch Set 2:
(2 comments)
https://gerrit.ovirt.org/#/c/41568/2/vdsm/gluster/cli.py
File vdsm/gluster/cli.py:
Line 30: from storage import glusterUtils as gu
Line 31:
Line 32: _glusterCommandPath = utils.CommandPath("gluster",
Line 33: "/usr/sbin/gluster",
Line 34: )
> Should be removed as its no longer used...
Done
Line 35: _TIME_ZONE = time.tzname[0]
Line 36:
Line 37:
Line 38: if hasattr(etree, 'ParseError'):
https://gerrit.ovirt.org/#/c/41568/2/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 419: def set_rp_filter_loose(self, dev):
Line 420: sysctl.set_rp_filter_loose(dev)
Line 421:
Line 422: @logDecorator
Line 423: def volumeInfo(self, remoteServer, volumeName=None):
> This is gluster specific verb, should be named glusterVolumeInfo.
Done
Line 424: return glusterUtils.volumeInfo(remoteServer, volumeName)
Line 425:
Line 426: @logDecorator
Line 427: def set_rp_filter_strict(self, dev):
--
To view, visit https://gerrit.ovirt.org/41568
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Ala Hino
Gerrit-Reviewer: Allon Mureinik
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Darshan N
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: Sahina Bose
Gerrit-Reviewer: Timothy Asir
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: verbs to override/reset cli snapshot scheduling.
Hello Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42302
to review the following change.
Change subject: gluster: verbs to override/reset cli snapshot scheduling.
..
gluster: verbs to override/reset cli snapshot scheduling.
This patch adds two verbs to override/reset gluster cli
based snapshot scheduling. The verbs are as follows:
*snapshotScheduleOverride: This verb sets the snapshot
scheduling flag in meta-volume to ovirt, this means
the snapshot scheduling job will be taken care by
engine and the gluster won't be able to schedule
snapshots. This has optional argument force. With
force option, any existing gluster schedules will
be disabled.
*snapshotScheduleReset: This verb sets the snapshot
scheduling flag in meta-volume to none, this means
the snapshot scheduling job will no longer be taken
care by engine.
Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1230342
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/40141
Reviewed-by: Bala.FA
Continuous-Integration: Jenkins CI
Reviewed-by: Shubhendu Tripathi
Reviewed-by: Dan Kenigsberg
---
M client/vdsClientGluster.py
M vdsm.spec.in
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 123 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/42302/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index 668babe..a4bce63 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -724,7 +724,19 @@
metaVolumeName = params.get('metaVolumeName', '')
status = self.s.glusterMetaVolumeMount(metaVolumeName)
+pp.pprint(status)
+return status['status']['code'], status['status']['message']
+def do_glusterSnapshotScheduleOverride(self, args):
+params = self._eqSplit(args)
+force = (params.get('force', 'no').upper() == 'YES')
+
+status = self.s.glusterSnapshotScheduleOverride(force)
+pp.pprint(status)
+return status['status']['code'], status['status']['message']
+
+def do_glusterSnapshotScheduleReset(self, args):
+status = self.s.glusterSnapshotScheduleReset()
pp.pprint(status)
return status['status']['code'], status['status']['message']
@@ -1230,5 +1242,15 @@
serv.do_glusterMetaVolumeMount,
('[volumeName=]',
'mount the meta-volume'
+ )),
+ 'glusterSnapshotScheduleOverride': (
+ serv.do_glusterSnapshotScheduleOverride,
+ ('[force={yes|no}]\n\t',
+ 'override gluster snapshot scheduling'
+ )),
+ 'glusterSnapshotScheduleReset': (
+ serv.do_glusterSnapshotScheduleReset,
+ ('',
+ 'Reset gluster snapshot scheduling'
))
}
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0414056..b2a514a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -289,7 +289,7 @@
# GlusterFS client-side RPMs needed for Gluster SD
%if 0%{?with_gluster}
-Requires: glusterfs >= 3.6.999
+Requires: glusterfs >= 3.7.1
Requires: glusterfs-cli
Requires: glusterfs-api
Requires: glusterfs-fuse
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index bc1fdcf..c007b28 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -19,6 +19,7 @@
#
import errno
+import fcntl
import os
from functools import wraps
from vdsm.define import doneCode
@@ -38,8 +39,17 @@
MOUNT_BROKER_ROOT = "/var/mountbroker-root"
META_VOLUME = "gluster_shared_storage"
META_VOL_MOUNT_POINT = "/var/run/gluster/shared_storage"
+LOCK_FILE_DIR = META_VOL_MOUNT_POINT + "/snaps/lock_files"
+LOCK_FILE = LOCK_FILE_DIR + "/lock_file"
+SNAP_SCHEDULER_FLAG_FILE = META_VOL_MOUNT_POINT + "/snaps/current_scheduler"
FS_TYPE = "glusterfs"
+SNAP_SCHEDULER_ALREADY_DISABLED_RC = 7
+
+_snapSchedulerPath = utils.CommandPath(
+"snap_scheduler.py",
+"/usr/sbin/snap_scheduler.py",
+)
GLUSTER_RPM_PACKAGES = (
('glusterfs', ('glusterfs',)),
@@ -208,6 +218,45 @@
if rc:
raise ge.GlusterMetaVolumeMountFailedException(
rc, out, err)
+return True
+
+
+@makePublic
+def snapshotScheduleDisable():
+command = [_snapSchedulerPath.cmd, "disable_force"]
+rc, out, err = utils.execCmd(command)
+if rc not in [0, SNAP_SCHEDULER_ALREADY_DISABLED_RC]:
+raise ge.GlusterDisableSnapshotScheduleFailedException(
+rc)
+return True
+
+
+@makePublic
+def snapshotScheduleFlagUpdate(value):
+if not os.path.exists(LOCK_FILE_DIR):
+try:
+os.makedirs(LOCK_FILE_DIR, 0o755)
+except OSError as e:
+raise ge.GlusterSnapshotScheduleFlagUpdateFailedException(
+err=[str(e)])
+
+try:
+
Change in vdsm[ovirt-3.5-gluster]: gluster: verbs to override/reset cli snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to override/reset cli snapshot scheduling. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42302 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to override/reset cli snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to override/reset cli snapshot scheduling. .. Patch Set 14: Verified+1 -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: Added an optional argument to mountBrokerSetup verb
Darshan N has posted comments on this change. Change subject: gluster: Added an optional argument to mountBrokerSetup verb .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/42298 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I732675c611221cf10f191f69990f78bd713da245 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: Added an optional argument to mountBrokerSetup verb
Hello Piotr Kliczewski, Bala.FA, Dan Kenigsberg, Sahina Bose,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/42298
to review the following change.
Change subject: gluster: Added an optional argument to mountBrokerSetup verb
..
gluster: Added an optional argument to mountBrokerSetup verb
Added an optional argument called "partial" to mountBrokerSetup
verb. This argument takes boolean value. If true only mount broker
root creation is done as part of mountBrokerSetup, else along with
root creation user addition and few mount broker options are also
set.
This is introduced because in only one of the slave node's all the
operations mentioned above has to be done, this is synced to all
the remaining nodes automatically. Only mount broker root creation
has to be performed on all the slave nodes. Engine can call this
verb with partial as false on one of the nodes and on all the other
nodes verb can be called with partial set to true.
Change-Id: I732675c611221cf10f191f69990f78bd713da245
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1230353
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/41600
Reviewed-by: Sahina Bose
Reviewed-by: Piotr Kliczewski
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
Continuous-Integration: Jenkins CI
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/rpc/vdsmapi-gluster-schema.json
4 files changed, 20 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/42298/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index fa8a725..668babe 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -671,10 +671,12 @@
remoteUserName = params.get('remoteUserName', '')
remoteVolumeName = params.get('remoteVolumeName', '')
remoteGroupName = params.get('remoteGroupName', '')
+partial = (params.get('partial', 'no').upper() == 'YES')
status = self.s.glusterGeoRepMountBrokerSetup(remoteUserName,
remoteGroupName,
- remoteVolumeName)
+ remoteVolumeName,
+ partial)
pp.pprint(status)
return status['status']['code'], status['status']['message']
@@ -1193,6 +1195,7 @@
('remoteUserName=remote_user_name'
'remoteVolumeName=remote_volume_name'
'remoteGroupName=remote_group_name',
+ '[partial={yes|no}]'
'setup mount broker for geo replication'
)),
'glusterVolumeGeoRepSessionCreate': (
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 6db6462..bc1fdcf 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -644,16 +644,17 @@
@exportAsVerb
def geoRepMountBrokerSetup(self, remoteUserName, remoteGroupName,
- remoteVolumeName, options=None):
+ remoteVolumeName, partial=False, options=None):
self.svdsmProxy.glusterCreateMountBrokerRoot(remoteUserName)
-mountBrokerOptions = {'mountbroker-root': MOUNT_BROKER_ROOT,
- 'geo-replication-log-group': remoteGroupName,
- 'rpc-auth-allow-insecure': 'on'}
-for optionName, optionValue in mountBrokerOptions.iteritems():
-self.svdsmProxy.glusterExecuteMountBrokerOpt(optionName,
- optionValue)
-self.svdsmProxy.glusterExecuteMountBrokerUserAdd(remoteUserName,
- remoteVolumeName)
+if not partial:
+mountBrokerOptions = {'mountbroker-root': MOUNT_BROKER_ROOT,
+ 'geo-replication-log-group': remoteGroupName,
+ 'rpc-auth-allow-insecure': 'on'}
+for optionName, optionValue in mountBrokerOptions.iteritems():
+self.svdsmProxy.glusterExecuteMountBrokerOpt(optionName,
+ optionValue)
+self.svdsmProxy.glusterExecuteMountBrokerUserAdd(remoteUserName,
+ remoteVolumeName)
@exportAsVerb
def volumeGeoRepSessionCreate(self, volumeName, remoteHost,
diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py
index 2298ebb..26eba7a 100644
--- a/vdsm/gluster/apiwrapper.py
+++ b/vdsm/gluster/apiwrapper.py
@@ -282,10 +282,11 @@
return self._gluster.geoRepKeysUpdate(userName, geoRepPubKeys)
def geoRepMountBrokerSetup(self, remoteUserName, remoteGroupName,
- remoteVolumeName):
+
Change in vdsm[master]: gluster: verbs to override/reset cli snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to override/reset cli snapshot scheduling. .. Patch Set 11: (3 comments) https://gerrit.ovirt.org/#/c/40141/11/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 44: META_VOL_MOUNT_POINT > its better to have SNAP_SCHEDULER_FLAG_FILE Done Line 740: force > I think force=True should be default. Done Line 741: glusterUpdateSnapshotScheduleFlag > supervdsm function name ends with action eg. glusterVolumeCreate() Done -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to override/reset cli snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to override/reset cli snapshot scheduling. .. Patch Set 10: Verified+1 -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to override/reset cli snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to override/reset cli snapshot scheduling. .. Patch Set 9: (2 comments) https://gerrit.ovirt.org/#/c/40141/9//COMMIT_MSG Commit Message: Line 7: enable > May be description should say oveeriding and reseting the CLI based schedul Done https://gerrit.ovirt.org/#/c/40141/9/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 227: if rc not in [0, 7]: > Better lets define error codes as constants Done -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Added an optional argument to mountBrokerSetup verb.
Darshan N has posted comments on this change. Change subject: gluster: Added an optional argument to mountBrokerSetup verb. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41600 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I732675c611221cf10f191f69990f78bd713da245 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: anmolbabu Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Added an optional argument to mountBrokerSetup verb.
Darshan N has uploaded a new change for review.
Change subject: gluster: Added an optional argument to mountBrokerSetup verb.
..
gluster: Added an optional argument to mountBrokerSetup verb.
Added an optional argument called "partial" to mountBrokerSetup
verb. This argument takes boolean value. If true only mount broker
root creation is done as part of mountBrokerSetup, else along with
root creation user addition and few mount broker options are also
set.
This is introduced because in only one of the slave node's all the
operations mentioned above has to be done, this is synced to all
the remaining nodes automatically. Only mount broker root creation
has to be performed on all the slave nodes. Engine can call this
verb with partial as false on one of the nodes and on all the other
nodes verb can be called with partial set to true.
Change-Id: I732675c611221cf10f191f69990f78bd713da245
Signed-off-by: Darshan N
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/rpc/vdsmapi-gluster-schema.json
4 files changed, 20 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/41600/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index fa8a725..668babe 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -671,10 +671,12 @@
remoteUserName = params.get('remoteUserName', '')
remoteVolumeName = params.get('remoteVolumeName', '')
remoteGroupName = params.get('remoteGroupName', '')
+partial = (params.get('partial', 'no').upper() == 'YES')
status = self.s.glusterGeoRepMountBrokerSetup(remoteUserName,
remoteGroupName,
- remoteVolumeName)
+ remoteVolumeName,
+ partial)
pp.pprint(status)
return status['status']['code'], status['status']['message']
@@ -1193,6 +1195,7 @@
('remoteUserName=remote_user_name'
'remoteVolumeName=remote_volume_name'
'remoteGroupName=remote_group_name',
+ '[partial={yes|no}]'
'setup mount broker for geo replication'
)),
'glusterVolumeGeoRepSessionCreate': (
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 6aca2e7..7f7f85c 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -644,16 +644,17 @@
@exportAsVerb
def geoRepMountBrokerSetup(self, remoteUserName, remoteGroupName,
- remoteVolumeName, options=None):
+ remoteVolumeName, partial=False, options=None):
self.svdsmProxy.glusterCreateMountBrokerRoot(remoteUserName)
-mountBrokerOptions = {'mountbroker-root': MOUNT_BROKER_ROOT,
- 'geo-replication-log-group': remoteGroupName,
- 'rpc-auth-allow-insecure': 'on'}
-for optionName, optionValue in mountBrokerOptions.iteritems():
-self.svdsmProxy.glusterExecuteMountBrokerOpt(optionName,
- optionValue)
-self.svdsmProxy.glusterExecuteMountBrokerUserAdd(remoteUserName,
- remoteVolumeName)
+if not partial:
+mountBrokerOptions = {'mountbroker-root': MOUNT_BROKER_ROOT,
+ 'geo-replication-log-group': remoteGroupName,
+ 'rpc-auth-allow-insecure': 'on'}
+for optionName, optionValue in mountBrokerOptions.iteritems():
+self.svdsmProxy.glusterExecuteMountBrokerOpt(optionName,
+ optionValue)
+self.svdsmProxy.glusterExecuteMountBrokerUserAdd(remoteUserName,
+ remoteVolumeName)
@exportAsVerb
def volumeGeoRepSessionCreate(self, volumeName, remoteHost,
diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py
index 2298ebb..26eba7a 100644
--- a/vdsm/gluster/apiwrapper.py
+++ b/vdsm/gluster/apiwrapper.py
@@ -282,10 +282,11 @@
return self._gluster.geoRepKeysUpdate(userName, geoRepPubKeys)
def geoRepMountBrokerSetup(self, remoteUserName, remoteGroupName,
- remoteVolumeName):
+ remoteVolumeName, partial=False):
return self._gluster.geoRepMountBrokerSetup(remoteUserName,
remoteGroupName,
-remoteVolumeName)
+remoteVolumeName,
+
Change in vdsm[master]: WIP: Remove Vdsm's dependency on gluster-server package.
Darshan N has uploaded a new change for review.
Change subject: WIP: Remove Vdsm's dependency on gluster-server package.
..
WIP: Remove Vdsm's dependency on gluster-server package.
In this patch have segregated the glusterVolumeInfo code
such that, vdsm package will not be dependent on vdsm-gluster
in turn gluster-server.
Pending: suitable spec file changes.
Change-Id: I43c8f16e8171693d1bbbff40198c59646022603e
Signed-off-by: Darshan N
---
M tests/functional/networkTests.py
M tests/gluster_cli_tests.py
M vdsm.spec.in
M vdsm/gluster/cli.py
M vdsm/storage/Makefile.am
A vdsm/storage/glusterUtils.py
M vdsm/storage/glusterVolume.py
M vdsm/supervdsmServer
8 files changed, 157 insertions(+), 84 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/41568/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 553f479..f70bedc 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -90,7 +90,7 @@
@RequireDummyMod
def setupModule():
"""Persists network configuration."""
-vdsm = VdsProxy()
+# vdsm = VdsProxy()
vdsm.save_config()
for _ in range(DUMMY_POOL_SIZE):
dummyPool.add(dummy.create())
@@ -98,7 +98,7 @@
def tearDownModule():
"""Restores the network configuration previous to running tests."""
-vdsm = VdsProxy()
+# vdsm = VdsProxy()
vdsm.restoreNetConfig()
for nic in dummyPool:
dummy.remove(nic)
diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py
index dfbb79a..5e6636a 100644
--- a/tests/gluster_cli_tests.py
+++ b/tests/gluster_cli_tests.py
@@ -20,6 +20,7 @@
from testlib import VdsmTestCase as TestCaseBase
from gluster import cli as gcli
+from storage import glusterUtils as gu
import xml.etree.cElementTree as etree
from nose.plugins.skip import SkipTest
import glusterTestData
@@ -38,7 +39,7 @@
"""
tree = etree.fromstring(out)
-self.assertFalse(gcli._parseVolumeInfo(tree))
+self.assertFalse(gu.parseVolumeInfo(tree))
def _parseVolumeInfo_test(self):
out = """
@@ -123,10 +124,10 @@
'stripeCount': '1',
'disperseCount': '0',
'redundancyCount': '0',
- 'transportType': [gcli.TransportType.TCP],
+ 'transportType': [gu.TransportType.TCP],
'uuid': 'b3114c71-741b-4c6f-a39e-80384c4ea3cf',
'volumeName': 'music',
- 'volumeStatus': gcli.VolumeStatus.ONLINE,
+ 'volumeStatus': gu.VolumeStatus.ONLINE,
'volumeType': 'REPLICATE'},
'test1': {'brickCount': '1',
'bricks': ['192.168.122.2:/tmp/t_b1'],
@@ -140,12 +141,12 @@
'stripeCount': '1',
'disperseCount': '0',
'redundancyCount': '0',
- 'transportType': [gcli.TransportType.RDMA],
+ 'transportType': [gu.TransportType.RDMA],
'uuid': 'b444ed94-f346-4cda-bd55-0282f21d22db',
'volumeName': 'test1',
- 'volumeStatus': gcli.VolumeStatus.OFFLINE,
+ 'volumeStatus': gu.VolumeStatus.OFFLINE,
'volumeType': 'DISTRIBUTE'}}
-volumeInfo = gcli._parseVolumeInfo(tree)
+volumeInfo = gu.parseVolumeInfo(tree)
self.assertEquals(volumeInfo, oVolumeInfo)
def test_parseVolumeInfo(self):
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 5937398..5c99188 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1153,6 +1153,7 @@
%{_datadir}/%{vdsm_name}/storage/fileVolume.py*
%{_datadir}/%{vdsm_name}/storage/fuser.py*
%{_datadir}/%{vdsm_name}/storage/glusterSD.py*
+%{_datadir}/%{vdsm_name}/storage/glusterUtils.py*
%{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
%{_datadir}/%{vdsm_name}/storage/hba.py*
%{_datadir}/%{vdsm_name}/storage/hsm.py*
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index d53a1c8..0d3f041 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -27,6 +27,7 @@
import exception as ge
from hostname import getHostNameFqdn, HostNameException
from . import makePublic
+from storage import glusterUtils as gu
_glusterCommandPath = utils.CommandPath("gluster",
"/usr/sbin/gluster",
@@ -41,15 +42,15 @@
def _getGlusterVolCmd():
-return [_glusterCommandPath.cmd, "--mode=script", "volume"]
+return [gu.glusterCommandPath.cmd, "--mode=script", "volume"]
def _getGlusterPeerCmd():
-return [_glusterCommandPath.cmd, "--mode=script", "peer"]
+return [gu.glusterCommandPath.cmd, "--mode=script", "peer"]
def _getGlusterSystemCmd():
-return [_glusterCommandPath.cmd, "system::"]
+return [gu.glusterCommandPath
Change in vdsm[master]: gluster:fix NoneType error for some devices does not contain...
Darshan N has posted comments on this change. Change subject: gluster:fix NoneType error for some devices does not contain sysfsPath .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/41262 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I54efdf3958519e2ae038b527a03e0b57569c2e8f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster:Remove support for Replace gluster brick with data m...
Darshan N has posted comments on this change. Change subject: gluster:Remove support for Replace gluster brick with data migration. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41214 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1569972120da27c17407bec5301b1ba417ce0768 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: raise proper execption if the given mount point is ...
Darshan N has posted comments on this change. Change subject: gluster: raise proper execption if the given mount point is in use. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41207 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic12acd2e4bf6a88936af582bb17d50d72cdfb84f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix format type test-case error
Darshan N has posted comments on this change. Change subject: gluster: fix format type test-case error .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41216 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I193616848d6ae6153f3f203c33acd42e974836f0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: Added volumeReplaceBrickCommitForce verb.
Darshan N has posted comments on this change. Change subject: gluster: Added volumeReplaceBrickCommitForce verb. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41217 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix no attribute error
Darshan N has posted comments on this change. Change subject: gluster: fix no attribute error .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41218 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix pyflakes error in mount point verification
Darshan N has posted comments on this change. Change subject: gluster: fix pyflakes error in mount point verification .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41215 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4ad096e0c8cb470311d9f219e7469b16fd697de Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41209 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix fstype unavailable for a formatted device
Darshan N has posted comments on this change. Change subject: gluster: fix fstype unavailable for a formatted device .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/41208 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If7c5d3913b61e37c6a4ad31e0348f86cde6152b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: Adds a new element 'additionalFeatures' to getVdsCaps.
Darshan N has posted comments on this change. Change subject: gluster: Adds a new element 'additionalFeatures' to getVdsCaps. .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/40044 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic203fa0565914d528ae457427f6f1ff7708017d2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Darshan N Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix format type test-case error
Hello Timothy Asir, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/41216 to review the following change. Change subject: gluster: fix format type test-case error .. gluster: fix format type test-case error Change-Id: I193616848d6ae6153f3f203c33acd42e974836f0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1209493 Signed-off-by: Timothy Asir Jeyasingh Reviewed-on: https://gerrit.ovirt.org/41045 Continuous-Integration: Jenkins CI Reviewed-by: Darshan N Reviewed-by: Dan Kenigsberg --- M tests/glusterTestData.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/41216/1 diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py index ef49287..e412349 100644 --- a/tests/glusterTestData.py +++ b/tests/glusterTestData.py @@ -918,6 +918,7 @@ device.kids = 0 device.model = None device.type = "disk" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = None device.format.uuid = None @@ -934,6 +935,7 @@ device.kids = 1 device.model = "Virtio Block Device" device.type = "disk" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = 'multipath_member' device.format.status = True @@ -952,6 +954,7 @@ device.kids = 1 device.model = "Virtio Block Device" device.type = "disk" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = None device.format.uuid = None @@ -967,6 +970,7 @@ device.kids = 0 device.model = "Virtio Block Device" device.type = "partition" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = 'xfs' device.format.uuid = "12345-12345-12345" @@ -984,6 +988,7 @@ device.kids = 0 device.model = "Virtio Block Device" device.type = "partition" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = 'xfs' device.format.uuid = "12344-12344-12344" @@ -1000,6 +1005,7 @@ device.kids = 0 device.model = "Virtio Block Device" device.type = "partition" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = None device.format.uuid = None @@ -1016,6 +1022,7 @@ device.kids = 3 device.model = "Virtio Block Device" device.type = "disk" +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = None device.format.uuid = None @@ -1032,6 +1039,7 @@ device.kids = 0 device.model = "QEMU_DVD-ROM" device.type = "cdrom" +device.sysfsPath = '' device.format = TestStorageDev() device.format.uuid = None device.format.type = None @@ -1048,6 +1056,7 @@ device.kids = 0 device.model = '' device.type = 'lvmvg' +device.sysfsPath = '' device.format = TestStorageDev() device.format.type = None device.format.uuid = None -- To view, visit https://gerrit.ovirt.org/41216 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I193616848d6ae6153f3f203c33acd42e974836f0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Timothy Asir ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix no attribute error
Hello Piotr Kliczewski, Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41218
to review the following change.
Change subject: gluster: fix no attribute error
..
gluster: fix no attribute error
This was introduced with the patch: https://gerrit.ovirt.org/#/c/40206/.
In rhel6 and rhel7 this patch was passing the build.
In fedora this was introducing AttributeError.
This patch fixes that issue by selectively checking if attribute exists or not.
Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1209493
Signed-off-by: Timothy Asir Jeyasingh
Reviewed-on: https://gerrit.ovirt.org/41056
Reviewed-by: Federico Simoncelli
Tested-by: Piotr Kliczewski
Tested-by: Darshan N
Reviewed-by: Bala.FA
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg
---
M vdsm/gluster/storagedev.py
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/41218/1
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index db2ffec..0eea52c 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -79,7 +79,12 @@
info['model'] = device.type
if device.format:
info['uuid'] = device.format.uuid or ''
-dev = udev.get_device(device.sysfsPath) or {}
+if hasattr(udev, 'get_device'):
+dev = udev.get_device(device.sysfsPath)
+elif hasattr(udev, 'udev_get_device'):
+dev = udev.udev_get_device(device.sysfsPath)
+else:
+dev = {}
info['fsType'] = device.format.type or dev.get('ID_FS_TYPE', '')
if hasattr(device.format, 'mountpoint'):
info['mountPoint'] = device.format.mountpoint or ''
--
To view, visit https://gerrit.ovirt.org/41218
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster:Remove support for Replace gluster brick with data m...
Hello Piotr Kliczewski, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41214
to review the following change.
Change subject: gluster:Remove support for Replace gluster brick with data
migration.
..
gluster:Remove support for Replace gluster brick with data migration.
This patch removes verbs related to replace gluster brick
with data migration. Now only replace brick with commit
is retained. As this feature is deprecated in
glusterfs-3.7 on wards. These verbs were not consumed
by engine, so it should not cause any backward-compatibility
issues when removed. The list of verbs removed are as
follows:
*volumeReplaceBrickStart
*volumeReplaceBrickAbort
*volumeReplaceBrickPause
*volumeReplaceBrickStatus
*volumeReplaceBrickCommit
Change-Id: I1569972120da27c17407bec5301b1ba417ce0768
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/40545
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Piotr Kliczewski
Reviewed-by: Dan Kenigsberg
Signed-off-by: Darshan N
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/cli.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 0 insertions(+), 273 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/41214/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index cf6eff6..c88a73b 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -163,58 +163,6 @@
status = self.s.glusterHostRemoveByUuid(hostUuid, force)
return status['status']['code'], status['status']['message']
-def do_glusterVolumeReplaceBrickStart(self, args):
-params = self._eqSplit(args)
-volumeName = params.get('volumeName', '')
-existingBrick = params.get('existingBrick', '')
-newBrick = params.get('newBrick', '')
-
-status = self.s.glusterVolumeReplaceBrickStart(volumeName,
- existingBrick,
- newBrick)
-pp.pprint(status)
-return status['status']['code'], status['status']['message']
-
-def do_glusterVolumeReplaceBrickAbort(self, args):
-params = self._eqSplit(args)
-volumeName = params.get('volumeName', '')
-existingBrick = params.get('existingBrick', '')
-newBrick = params.get('newBrick', '')
-
-status = self.s.glusterVolumeReplaceBrickAbort(volumeName,
- existingBrick,
- newBrick)
-return status['status']['code'], status['status']['message']
-
-def do_glusterVolumeReplaceBrickPause(self, args):
-params = self._eqSplit(args)
-volumeName = params.get('volumeName', '')
-existingBrick = params.get('existingBrick', '')
-newBrick = params.get('newBrick', '')
-
-status = self.s.glusterVolumeReplaceBrickPause(volumeName,
- existingBrick,
- newBrick)
-return status['status']['code'], status['status']['message']
-
-def do_glusterVolumeReplaceBrickStatus(self, args):
-status = self.s.glusterVolumeReplaceBrickStatus(args[0], args[1],
-args[2])
-return status['status']['code'], status['status']['message']
-
-def do_glusterVolumeReplaceBrickCommit(self, args):
-params = self._eqSplit(args)
-volumeName = params.get('volumeName', '')
-existingBrick = params.get('existingBrick', '')
-newBrick = params.get('newBrick', '')
-force = (params.get('force', 'no').upper() == 'YES')
-
-status = self.s.glusterVolumeReplaceBrickCommit(volumeName,
-existingBrick,
-newBrick,
-force)
-return status['status']['code'], status['status']['message']
-
def do_glusterVolumeRemoveBrickStart(self, args):
params = self._eqSplit(args)
volumeName = params.get('volumeName', '')
@@ -872,49 +820,6 @@
' is UUID of the host in '
'gluster cluster',
'remove server from gluster cluster'
- )),
- 'glusterVolumeReplaceBrickStart': (
- serv.do_glusterVolumeReplaceBrickStart,
- ('volumeName= existingBrick= '
- 'newBrick=\n\t'
- ' is existing volume name\n\t'
- ' is existing brick\n\t'
- ' is new brick',
- 'start volume replace brick'
- )),
- 'glusterVolumeReplace
Change in vdsm[ovirt-3.5-gluster]: gluster: Added volumeReplaceBrickCommitForce verb.
Hello Piotr Kliczewski, Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41217
to review the following change.
Change subject: gluster: Added volumeReplaceBrickCommitForce verb.
..
gluster: Added volumeReplaceBrickCommitForce verb.
This patch adds volumeReplaceBrickCommitForce verb,
This verb replaces a gluster brick without any data
migration.
* volumeReplaceBrickCommitForce: It takes volumeName,
currentBrick and newBrick as arguments. It returns
success/failure.
Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/40587
Reviewed-by: Piotr Kliczewski
Continuous-Integration: Jenkins CI
Tested-by: Timothy Asir
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/cli.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 67 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/41217/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index c88a73b..fa8a725 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -163,6 +163,17 @@
status = self.s.glusterHostRemoveByUuid(hostUuid, force)
return status['status']['code'], status['status']['message']
+def do_glusterVolumeReplaceBrickCommitForce(self, args):
+params = self._eqSplit(args)
+volumeName = params.get('volumeName', '')
+existingBrick = params.get('existingBrick', '')
+newBrick = params.get('newBrick', '')
+
+status = self.s.glusterVolumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
+return status['status']['code'], status['status']['message']
+
def do_glusterVolumeRemoveBrickStart(self, args):
params = self._eqSplit(args)
volumeName = params.get('volumeName', '')
@@ -821,6 +832,15 @@
'gluster cluster',
'remove server from gluster cluster'
)),
+ 'glusterVolumeReplaceBrickCommitForce': (
+ serv.do_glusterVolumeReplaceBrickCommitForce,
+ ('volumeName= existingBrick= '
+ 'newBrick= \n\t'
+ ' is existing volume name\n\t'
+ ' is existing brick\n\t'
+ ' is new brick',
+ 'commit volume replace brick'
+ )),
'glusterVolumeRemoveBrickStart': (
serv.do_glusterVolumeRemoveBrickStart,
('volumeName= bricks= '
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index d7692f8..6db6462 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -284,6 +284,13 @@
return self.svdsmProxy.glusterVolumeRebalanceStatus(volumeName)
@exportAsVerb
+def volumeReplaceBrickCommitForce(self, volumeName, existingBrick,
+ newBrick, options=None):
+self.svdsmProxy.glusterVolumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
+
+@exportAsVerb
def volumeRemoveBrickStart(self, volumeName, brickList,
replicaCount=0, options=None):
return self.svdsmProxy.glusterVolumeRemoveBrickStart(volumeName,
diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py
index 76af453..2298ebb 100644
--- a/vdsm/gluster/apiwrapper.py
+++ b/vdsm/gluster/apiwrapper.py
@@ -164,6 +164,11 @@
return self._gluster.volumeRemoveBrickForce(volumeName, brickList,
replicaCount)
+def replaceBrickCommitForce(self, volumeName, existingBrick, newBrick):
+return self._gluster.volumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
+
def profileInfo(self, volumeName, nfs=False):
return self._gluster.volumeProfileInfo(volumeName, nfs)
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index 7620b96..5f21e0d 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -726,6 +726,19 @@
@makePublic
+def volumeReplaceBrickCommitForce(volumeName, existingBrick, newBrick):
+command = _getGlusterVolCmd() + ["replace-brick", volumeName,
+ existingBrick, newBrick, "commit",
+ "force"]
+try:
+_execGlusterXml(command)
+return True
+except ge.GlusterCmdFailedException as e:
+raise ge.GlusterVolumeReplaceBrickCommitForc
Change in vdsm[ovirt-3.5-gluster]: gluster: fix pyflakes error in mount point verification
Hello Timothy Asir, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/41215 to review the following change. Change subject: gluster: fix pyflakes error in mount point verification .. gluster: fix pyflakes error in mount point verification Change-Id: Id4ad096e0c8cb470311d9f219e7469b16fd697de Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1209475 Signed-off-by: Timothy Asir Jeyasingh Reviewed-on: https://gerrit.ovirt.org/41046 Continuous-Integration: Jenkins CI Reviewed-by: Darshan N Reviewed-by: Dan Kenigsberg --- M vdsm/gluster/exception.py M vdsm/gluster/storagedev.py 2 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/41215/1 diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index ddff244..7799651 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -430,10 +430,7 @@ class GlusterHostStorageMountPointInUseException(GlusterHostException): code = 4517 -def __init__(self, mountPoint, rc=0, out=(), err=()): -self.rc = rc -self.out = out -self.err = err +def __init__(self, mountPoint): self.message = "Mount point %s is in use" % mountPoint diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index 7754051..db2ffec 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -217,8 +217,7 @@ return blivetEnv.devicetree.getDeviceByName(poolLv.name) if os.path.ismount(mountPoint): -raise ge.GlusterHostStorageMountPointInUseException( -mountPoint, rc, out, err) +raise ge.GlusterHostStorageMountPointInUseException(mountPoint) vgName = "vg-" + brickName poolName = "pool-" + brickName -- To view, visit https://gerrit.ovirt.org/41215 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4ad096e0c8cb470311d9f219e7469b16fd697de Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Timothy Asir ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: Adds a new element 'extraFeaturesSupported' to getV...
Darshan N has restored this change. Change subject: gluster: Adds a new element 'extraFeaturesSupported' to getVdsCaps. .. Restored Restoring to send the updated patch -- To view, visit https://gerrit.ovirt.org/40044 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: Ic203fa0565914d528ae457427f6f1ff7708017d2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: New verb to mount & update fstab for meta-volume
Hello Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41209
to review the following change.
Change subject: gluster: New verb to mount & update fstab for meta-volume
..
gluster: New verb to mount & update fstab for meta-volume
This patch adds a new verb 'MetaVolumeMount' to
update fstab entry for meta-volume and mount it. This
meta-volume is needed by various glusterfs features
like snapshot-schedule, geo-replication etc. It is
expected to be mounted on all gluster nodes. It takes
an optional argument metaVolumeName.
Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/40497
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
5 files changed, 98 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/41209/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index 4f53eb4..cf6eff6 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -758,6 +758,15 @@
pp.pprint(status)
return status['status']['code'], status['status']['message']
+def do_glusterMetaVolumeMount(self, args):
+params = self._eqSplit(args)
+metaVolumeName = params.get('metaVolumeName', '')
+
+status = self.s.glusterMetaVolumeMount(metaVolumeName)
+
+pp.pprint(status)
+return status['status']['code'], status['status']['message']
+
def getGlusterCmdDict(serv):
return \
@@ -1288,5 +1297,10 @@
serv.do_glusterVolumeEmptyCheck,
('volumeName=',
'Check if the given volume is empty or not'
+ )),
+ 'glusterMetaVolumeMount': (
+ serv.do_glusterMetaVolumeMount,
+ ('[volumeName=]',
+ 'mount the meta-volume'
))
}
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 8974e8e..6539c19 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -22,16 +22,23 @@
import os
from functools import wraps
from vdsm.define import doneCode
+from vdsm import constants, utils
from pwd import getpwnam
+from storage import mount
import supervdsm as svdsm
import exception as ge
from . import makePublic
from . import safeWrite
+import fstab
+import logging
_SUCCESS = {'status': doneCode}
GEOREP_PUB_KEY_PATH = "/var/lib/glusterd/geo-replication/common_secret.pem.pub"
MOUNT_BROKER_ROOT = "/var/mountbroker-root"
+META_VOLUME = "gluster_shared_storage"
+META_VOL_MOUNT_POINT = "/var/run/gluster/shared_storage"
+FS_TYPE = "glusterfs"
GLUSTER_RPM_PACKAGES = (
@@ -140,6 +147,53 @@
except OSError as e:
raise ge.GlusterMountBrokerRootCreateFailedException(err=[str(e)])
return
+
+
+@makePublic
+def mountMetaVolume(metaVolumeName):
+def _metaVolumeFstabUpdate(metaVolumeName):
+try:
+fs_spec = "127.0.0.1:" + metaVolumeName
+fstab.FsTab().add(fs_spec, META_VOL_MOUNT_POINT, FS_TYPE,
+ mntOpts=['defaults', '_netdev'])
+except IOError as e:
+raise ge.GlusterMetaVolumeFstabUpdateFailedException(
+err=["fstab update failed", str(e)])
+except ge.GlusterHostStorageDeviceFsTabFoundException as e:
+logging.warn(e.message)
+
+_metaVolumeFstabUpdate(metaVolumeName)
+
+if os.path.ismount(META_VOL_MOUNT_POINT):
+try:
+fs_spec = mount.getMountFromTarget(
+os.path.realpath(META_VOL_MOUNT_POINT)).fs_spec
+if fs_spec.endswith(META_VOLUME):
+logging.warn("Meta Volume %s already mounted at %s" % (
+META_VOLUME, META_VOL_MOUNT_POINT))
+return True
+else:
+raise ge.GlusterMetaVolumeMountFailedException(
+err=["%s already mounted at %s" % (
+fs_spec, META_VOL_MOUNT_POINT)])
+except OSError as e:
+raise ge.GlusterMetaVolumeMountFailedException(
+err=["Failed to check if volume is already mounted",
+ str(e)])
+else:
+try:
+os.makedirs(META_VOL_MOUNT_POINT, 0o755)
+except OSError as e:
+if e.errno != errno.EEXIST:
+raise ge.GlusterMetaVolumeMountFailedException(
+err=['Mount Point creation failed', str(e)])
+
+command = [constants.EXT_MOUNT, META_VOL_MOUNT_POINT]
+rc, out, err = utils.execCmd(command)
+if rc:
+raise ge.GlusterMetaVolumeMountFailedException(
+rc, out, err)
+return True
class GlusterApi(object):
@@ -644,6 +698,10 @@
status = s
Change in vdsm[ovirt-3.5-gluster]: gluster: raise proper execption if the given mount point is ...
Hello Timothy Asir, Bala.FA, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/41207 to review the following change. Change subject: gluster: raise proper execption if the given mount point is in use. .. gluster: raise proper execption if the given mount point is in use. Currently if an already used mount point is given for the brick create function, it does all the lvm tasks and returns Unexpected Exception when it tries to mout the device at the end of brick create scenario. This patch will check the availablity of the given mount point and returns an appropriate error message. Change-Id: Ic12acd2e4bf6a88936af582bb17d50d72cdfb84f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1209475 Signed-off-by: Timothy Asir Jeyasingh Reviewed-on: https://gerrit.ovirt.org/40892 Continuous-Integration: Jenkins CI Reviewed-by: Bala.FA Reviewed-by: Dan Kenigsberg --- M vdsm/gluster/exception.py M vdsm/gluster/storagedev.py 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/41207/1 diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index d093661..8d3ec7a 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -467,6 +467,16 @@ message = "Make directories failed" +class GlusterHostStorageMountPointInUseException(GlusterHostException): +code = 4517 + +def __init__(self, mountPoint, rc=0, out=(), err=()): +self.rc = rc +self.out = out +self.err = err +self.message = "Mount point %s is in use" % mountPoint + + # Hook class GlusterHookException(GlusterException): code = 4500 diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index a860179..f8cfc55 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -214,6 +214,10 @@ blivetEnv.reset() return blivetEnv.devicetree.getDeviceByName(poolLv.name) +if os.path.ismount(mountPoint): +raise ge.GlusterHostStorageMountPointInUseException( +mountPoint, rc, out, err) + vgName = "vg-" + brickName poolName = "pool-" + brickName alignment = 0 -- To view, visit https://gerrit.ovirt.org/41207 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic12acd2e4bf6a88936af582bb17d50d72cdfb84f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Timothy Asir ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: fix fstype unavailable for a formatted device
Hello Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41208
to review the following change.
Change subject: gluster: fix fstype unavailable for a formatted device
..
gluster: fix fstype unavailable for a formatted device
Finds the fstype and add it to the device dictonary
Change-Id: If7c5d3913b61e37c6a4ad31e0348f86cde6152b9
Signed-off-by: Timothy Asir Jeyasingh
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1209493
Signed-off-by: Timothy Asir Jeyasingh
Reviewed-on: https://gerrit.ovirt.org/40206
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Dan Kenigsberg
---
M vdsm/gluster/storagedev.py
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/41208/1
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index f8cfc55..7754051 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -30,6 +30,7 @@
from blivet.devices import LVMThinPoolDevice
from blivet.devices import LVMLogicalVolumeDevice
from blivet.devices import LVMThinLogicalVolumeDevice
+from blivet import udev
import storage.lvm as lvm
from vdsm import utils
@@ -78,7 +79,8 @@
info['model'] = device.type
if device.format:
info['uuid'] = device.format.uuid or ''
-info['fsType'] = device.format.type or ''
+dev = udev.get_device(device.sysfsPath) or {}
+info['fsType'] = device.format.type or dev.get('ID_FS_TYPE', '')
if hasattr(device.format, 'mountpoint'):
info['mountPoint'] = device.format.mountpoint or ''
return info
--
To view, visit https://gerrit.ovirt.org/41208
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7c5d3913b61e37c6a4ad31e0348f86cde6152b9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix no attribute error
Darshan N has posted comments on this change. Change subject: gluster: fix no attribute error .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/41056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix no attribute error
Darshan N has posted comments on this change. Change subject: gluster: fix no attribute error .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/41056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix no attribute error
Darshan N has posted comments on this change. Change subject: gluster: fix no attribute error .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4ee6f3d62e51c67db12b4859da6508c50e92753 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix format type test-case error
Darshan N has posted comments on this change. Change subject: gluster: fix format type test-case error .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41045 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I193616848d6ae6153f3f203c33acd42e974836f0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: fix pyflakes error in mount point verification
Darshan N has posted comments on this change. Change subject: gluster: fix pyflakes error in mount point verification .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41046 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4ad096e0c8cb470311d9f219e7469b16fd697de Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 7: Verified+1 -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 6: (2 comments) https://gerrit.ovirt.org/#/c/40497/6/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 173: ismount > move this if block to try level. its ok to execute it on successful os.mak Done Line 175: , > the check here is Done -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to enable/disable snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to enable/disable snapshot scheduling. .. Patch Set 7: -Verified -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to enable/disable snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to enable/disable snapshot scheduling. .. Patch Set 7: Verified+1 -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 6: Verified+1 -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 5: (6 comments) https://gerrit.ovirt.org/#/c/40497/5/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 153: metaVolumeFstabUpdate > move this function as subfunction to mountMetaVolume() Done Line 155: hostname > hostname as a variable is not needed. Done Line 156: ":" > its called fs_spec as per fstab man page. please change it accordingly. Done Line 163: e > i think logging.warn() is better Done Line 172: > how about e.EEXIST check than os.path.exists()? Done Line 178: META_VOL_MOUNT_POINT > you just need to check whether META_VOL_MOUNT_POINT is a mount point. may Done -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Added volumeReplaceBrickCommitForce verb.
Darshan N has posted comments on this change. Change subject: gluster: Added volumeReplaceBrickCommitForce verb. .. Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/40587/3/vdsm/rpc/vdsmapi-gluster-schema.json File vdsm/rpc/vdsmapi-gluster-schema.json: Line 1087: # @GlusterVolume.replaceBrickCommitForce: Line 1088: # Line 1089: # Replace Gluster volume brick Line 1090: # Line 1091: # @volumeName: Gluster volume name > Please align parameter description in line Done Line 1092: # Line 1093: # @existingBrick: Existing brick Line 1094: # Line 1095: # @newBrick: New brick -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Added volumeReplaceBrickCommitForce verb.
Darshan N has posted comments on this change. Change subject: gluster: Added volumeReplaceBrickCommitForce verb. .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: revamp in geo-replication status and list verbs.
Darshan N has posted comments on this change. Change subject: gluster: revamp in geo-replication status and list verbs. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/40950 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia9405e936b69e9dd4d2ed6621cfc1c70752def26 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: revamp in geo-replication status and list verbs.
Hello Piotr Kliczewski, Timothy Asir, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/40950
to review the following change.
Change subject: gluster: revamp in geo-replication status and list verbs.
..
gluster: revamp in geo-replication status and list verbs.
This patch modifies geo-replication status and geo-replication
list verbs to accomodate the corresponding changes in gluster
geo-replication.
Change-Id: Ia9405e936b69e9dd4d2ed6621cfc1c70752def26
Signed-off-by: Darshan N
Reviewed-on: https://gerrit.ovirt.org/39910
Reviewed-by: Timothy Asir
Continuous-Integration: Jenkins CI
Reviewed-by: Piotr Kliczewski
Reviewed-by: Dan Kenigsberg
---
M tests/glusterGeoRepStatus.xml
M tests/glusterTestData.py
M tests/gluster_cli_tests.py
M vdsm/gluster/api.py
M vdsm/gluster/cli.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 88 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/40950/1
diff --git a/tests/glusterGeoRepStatus.xml b/tests/glusterGeoRepStatus.xml
index cf3a28c..d1dc2ca 100644
--- a/tests/glusterGeoRepStatus.xml
+++ b/tests/glusterGeoRepStatus.xml
@@ -15,14 +15,17 @@
/root/b1_vol1
root
192.168.122.145::vol2
+ 192.168.122.145
Stopped
-N/A
N/A
-0
-0
-0
-0
-0
+2014-12-12 05:18:23
+0
+0
+0
+0
+ 2014-12-12 05:17:23
+ 2014-12-12
05:18:20
+ Yes
diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py
index 0fdb7ef..ef49287 100644
--- a/tests/glusterTestData.py
+++ b/tests/glusterTestData.py
@@ -1059,21 +1059,24 @@
'sessions': [
{'bricks': [
{'status': 'Stopped',
- 'bytesPending': '0',
'brickName': '/root/b1_vol1',
'crawlStatus': 'N/A',
- 'filesPending': '0',
- 'filesSynced': '0',
- 'remoteUserName': 'root',
'hostUuid': '6a2f7584-05a8-4651-8786-1cd6ae87b896',
'remoteHost': '192.168.122.145',
- 'checkpointStatus': 'N/A',
+ 'checkpointCompletionTime': 1418361500,
+ 'meta': '0',
+ 'checkpointCompleted': 'Yes',
'host': 'localhost.localdomain',
- 'filesSkipped': '0',
- 'deletesPending': '0'}],
+ 'checkpointTime': 1418361443,
+ 'lastSynced': 1418361503,
+ 'failures': '0',
+ 'entry': '0',
+ 'remoteUserName': 'root',
+ 'timeZone': 'IST',
+ 'data': '0'}],
'remoteVolumeName': 'vol2',
- 'sessionKey': '6a2f7584-05a8-4651-8786-1cd6ae87b896'
- ':ssh://192.168.122.145::vol2'}
+ 'sessionKey': '6a2f7584-05a8-4651-8786-1cd6ae87b896:ssh:'
+ '//192.168.122.145::vol2'}
]
}
}
diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py
index 1084f9a..a427a8d 100644
--- a/tests/gluster_cli_tests.py
+++ b/tests/gluster_cli_tests.py
@@ -1163,7 +1163,8 @@
with open("glusterGeoRepStatus.xml") as f:
out = f.read()
tree = etree.fromstring(out)
-status = gcli._parseGeoRepStatus(tree, detail=True)
+gcli._TIME_ZONE = 'IST'
+status = gcli._parseGeoRepStatus(tree)
self.assertEquals(status, glusterTestData.GLUSTER_GEOREP_STATUS)
def test_parseVolumeGeoRepConfig(self):
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 40ca153..8974e8e 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -449,8 +449,7 @@
volumeName,
remoteHost,
remoteVolumeName,
-remoteUserName,
-detail=True
+remoteUserName
)
return {'sessionStatus': status}
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index 8af5be0..8554664 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -1122,7 +1122,7 @@
err=e.err)
-def _parseGeoRepStatus(tree, detail=False):
+def _parseGeoRepStatus(tree):
"""
Returns:
{volume-name: [{sessionKey: 'key to identify the session',
@@ -1133,13 +1133,17 @@
remoteHost: 'slave',
status: 'status'
remoteUserName: 'root'
- checkpointStatus: 'checkpoint status'
+ timeZone: 'nodes time zone'
crawlStatus: 'crawlStatus'
- *filesSynced: 'nos of files syncd'
-
Change in vdsm[ovirt-3.5-gluster]: gluster: List activate-on-create volume snapshot option
Darshan N has posted comments on this change. Change subject: gluster: List activate-on-create volume snapshot option .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/40949 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I50ad0f482fc3d65e489c0a5c27212b84058c4c73 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5-gluster]: gluster: List activate-on-create volume snapshot option
Hello Piotr Kliczewski, Timothy Asir, Bala.FA, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/40949
to review the following change.
Change subject: gluster: List activate-on-create volume snapshot option
..
gluster: List activate-on-create volume snapshot option
Modified the verb glusterSnapshotConfigList to list
option activate-on-create as well.
Change-Id: I50ad0f482fc3d65e489c0a5c27212b84058c4c73
Signed-off-by: Shubhendu Tripathi
Bug-URL: https://bugzilla.redhat.com/1216056
Reviewed-on: https://gerrit.ovirt.org/40416
Reviewed-by: Darshan N
Reviewed-by: Timothy Asir
Continuous-Integration: Jenkins CI
Reviewed-by: Bala.FA
Reviewed-by: Piotr Kliczewski
Reviewed-by: Dan Kenigsberg
---
M tests/glusterSnapshotConfig.xml
M tests/glusterTestData.py
M vdsm/gluster/cli.py
M vdsm/rpc/vdsmapi-gluster-schema.json
4 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/40949/1
diff --git a/tests/glusterSnapshotConfig.xml b/tests/glusterSnapshotConfig.xml
index d167fdc..698e806 100644
--- a/tests/glusterSnapshotConfig.xml
+++ b/tests/glusterSnapshotConfig.xml
@@ -8,6 +8,7 @@
255
91%
disable
+ disable
diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py
index ad92ea2..0fdb7ef 100644
--- a/tests/glusterTestData.py
+++ b/tests/glusterTestData.py
@@ -1142,7 +1142,8 @@
'system': {
'snap-max-hard-limit': '255',
'auto-delete': 'disable',
-'snap-max-soft-limit': '91%'
+'snap-max-soft-limit': '91%',
+'activate-on-create': 'disable'
}
}
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index e2462bb..8af5be0 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -1390,7 +1390,8 @@
"""
returns {'system':{'snap-max-hard-limit': 'hardlimit',
'snap-max-soft-limit': 'softLimit',
- 'auto-delete': 'enable/disable'},
+ 'auto-delete': 'enable/disable',
+ 'activate-on-create': 'enable/disable'},
'volume':{'name' :
{'snap-max-hard-limit: 'hardlimit'}
}
@@ -1403,6 +1404,8 @@
'snapConfig/systemConfig/softLimit').text
systemConfig['auto-delete'] = tree.find(
'snapConfig/systemConfig/autoDelete').text
+systemConfig['activate-on-create'] = tree.find(
+'snapConfig/systemConfig/activateOnCreate').text
volumeConfig = {}
for el in tree.findall('snapConfig/volumeConfig/volume'):
diff --git a/vdsm/rpc/vdsmapi-gluster-schema.json
b/vdsm/rpc/vdsmapi-gluster-schema.json
index 7dc4fab..0aef3e6 100644
--- a/vdsm/rpc/vdsmapi-gluster-schema.json
+++ b/vdsm/rpc/vdsmapi-gluster-schema.json
@@ -1862,11 +1862,13 @@
#
# @auto-delete: Auto delete enabled/disabled
#
+# @activate-on-create: Auto activate enabled/disabled
+#
# @Since: 4.17.0
##
{'type': 'SystemSnapshotConfig',
'data': {'snap-max-hard-limit': 'str', 'snap-max-soft-limit': 'str',
- 'auto-delete': 'str'}}
+ 'auto-delete': 'str', 'activate-on-create': 'str'}}
##
#
--
To view, visit https://gerrit.ovirt.org/40949
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50ad0f482fc3d65e489c0a5c27212b84058c4c73
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5-gluster
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Timothy Asir
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster:Remove support for Replace gluster brick with data m...
Darshan N has posted comments on this change. Change subject: gluster:Remove support for Replace gluster brick with data migration. .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/40545 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1569972120da27c17407bec5301b1ba417ce0768 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Added volumeReplaceBrickCommitForce verb.
Darshan N has posted comments on this change. Change subject: gluster: Added volumeReplaceBrickCommitForce verb. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 2: (2 comments) https://gerrit.ovirt.org/#/c/40497/2/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 686: metaVolumeMount > Also we should take meta volume name as an argument here, so later if name Done Line 686: metaVolumeMount > Why can't the meta volume be mounted always by the system itself? Its bett meta volume is user created volume, when user creates this volume through ovirt, it would be better to mount it through engine. -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to enable/disable snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to enable/disable snapshot scheduling. .. Patch Set 5: (2 comments) https://gerrit.ovirt.org/#/c/40141/5/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 150: snap_scheduler > can't this be loaded as module than exec? Done Line 162: try: Line 163: fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB) Line 164: safeWrite(SNAP_SCHEDULER_FLAG, value) Line 165: fcntl.flock(f, fcntl.LOCK_UN) Line 166: except IOError: > you should log the error Done Line 167: os.close(f) Line 168: raise ge.GlusterSnapshotScheduleFlagUpdateFailedException( Line 169: err=["unable to get the lock"]) Line 170: except OSError as e: -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Modified volumeReplaceBrickCommit verb.
Darshan N has posted comments on this change. Change subject: gluster: Modified volumeReplaceBrickCommit verb. .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: revamp in geo-replication status and list verbs.
Darshan N has posted comments on this change. Change subject: gluster: revamp in geo-replication status and list verbs. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/39910 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia9405e936b69e9dd4d2ed6621cfc1c70752def26 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: revamp in geo-replication status and list verbs.
Darshan N has posted comments on this change. Change subject: gluster: revamp in geo-replication status and list verbs. .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/39910/2/vdsm/gluster/cli.py File vdsm/gluster/cli.py: Line 1142: pending > what are these pendings? that was added by mistake, have removed it. -- To view, visit https://gerrit.ovirt.org/39910 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia9405e936b69e9dd4d2ed6621cfc1c70752def26 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Modified volumeReplaceBrickCommit verb.
Darshan N has posted comments on this change. Change subject: gluster: Modified volumeReplaceBrickCommit verb. .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/40587/1/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 218: volumeReplaceBrickCommitForce > doesn't the name change cause backward compatibility? Have changed the verb name back. -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster:Remove support for Replace gluster brick with data m...
Darshan N has posted comments on this change. Change subject: gluster:Remove support for Replace gluster brick with data migration. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/40545 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1569972120da27c17407bec5301b1ba417ce0768 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster:Remove support for Replace gluster brick with data m...
Darshan N has posted comments on this change. Change subject: gluster:Remove support for Replace gluster brick with data migration. .. Patch Set 2: (2 comments) https://gerrit.ovirt.org/#/c/40545/2//COMMIT_MSG Commit Message: Line 14: > Please list removed verbs here Done https://gerrit.ovirt.org/#/c/40545/2/vdsm/gluster/cli.py File vdsm/gluster/cli.py: Line 791: > without volumeReplaceBrickStart() how is volumeReplaceBrickCommit() going t glusterfs has removed even this. Earlier when replace brick was asynchronous with data migration support start was valid. Now replace brick can be executed only with commit force. the corresponding glusterfs patch: http://review.gluster.org/#/c/10577/ -- To view, visit https://gerrit.ovirt.org/40545 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1569972120da27c17407bec5301b1ba417ce0768 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/40497/2/vdsm/gluster/api.py File vdsm/gluster/api.py: Line 165: @makePublic Line 166: def mountMetaVolume(device): Line 167: if not os.path.exists(META_VOL_MOUNT_POINT): Line 168: try: Line 169: os.makedirs(META_VOL_MOUNT_POINT, 0o755) > Why 0o755 ? Any specific reason? This is new style octal literal. In vdsm this type of literal is being used since patch: https://gerrit.ovirt.org/#/c/40211/, which would be helpful for python 2 to 3 migration Line 170: except OSError: Line 171: raise ge.GlusterMetaVolumeMountFailedException( Line 172: err=['Mount Point creation failed']) Line 173: -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: revamp in geo-replication status and list verbs.
Darshan N has posted comments on this change.
Change subject: gluster: revamp in geo-replication status and list verbs.
..
Patch Set 2:
(1 comment)
https://gerrit.ovirt.org/#/c/39910/2/vdsm/gluster/cli.py
File vdsm/gluster/cli.py:
Line 1143: checkpointTime: 'checkpoint set time'
Line 1144: checkpointCompletionTime: 'checkpoint
completion
Line 1145: time'
Line 1146: checkpointCompleted: 'yes/no'}]...
Line 1147:]
> This vdsm verb is not released yet, so do we need backward compatibility?
Yes, Sahina is right. Since this verb was recently added and its not in any
release, This should no be a concern.
Line 1148: }
Line 1149: """
Line 1150: status = {}
Line 1151: for volume in tree.findall('geoRep/volume'):
--
To view, visit https://gerrit.ovirt.org/39910
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia9405e936b69e9dd4d2ed6621cfc1c70752def26
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Darshan N
Gerrit-Reviewer: Bala.FA
Gerrit-Reviewer: Darshan N
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sahina Bose
Gerrit-Reviewer: Timothy Asir
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Modified volumeReplaceBrickCommit verb.
Darshan N has posted comments on this change. Change subject: gluster: Modified volumeReplaceBrickCommit verb. .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/40587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Modified volumeReplaceBrickCommit verb.
Darshan N has uploaded a new change for review.
Change subject: gluster: Modified volumeReplaceBrickCommit verb.
..
gluster: Modified volumeReplaceBrickCommit verb.
This patch modifies volumeReplaceBrickCommit verb, this
verb was taking force as optional parameter. But in
glusterfs-3.7 this force option is made manditory in the
command. To accomodate that, removed force as optional
parameter from verb and replace brick is always executed
with force as option. The name of modified verb is
"volumeReplaceBrickCommitForce".
Change-Id: Id2dc16121cdba99c49d56c4e0b8e7a0194d58d14
Signed-off-by: Darshan N
---
M client/vdsClientGluster.py
M vdsm/gluster/api.py
M vdsm/gluster/apiwrapper.py
M vdsm/gluster/cli.py
M vdsm/gluster/exception.py
M vdsm/rpc/vdsmapi-gluster-schema.json
6 files changed, 45 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/40587/1
diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py
index c7ab5f6..72fdc02 100644
--- a/client/vdsClientGluster.py
+++ b/client/vdsClientGluster.py
@@ -163,17 +163,15 @@
status = self.s.glusterHostRemoveByUuid(hostUuid, force)
return status['status']['code'], status['status']['message']
-def do_glusterVolumeReplaceBrickCommit(self, args):
+def do_glusterVolumeReplaceBrickCommitForce(self, args):
params = self._eqSplit(args)
volumeName = params.get('volumeName', '')
existingBrick = params.get('existingBrick', '')
newBrick = params.get('newBrick', '')
-force = (params.get('force', 'no').upper() == 'YES')
-status = self.s.glusterVolumeReplaceBrickCommit(volumeName,
-existingBrick,
-newBrick,
-force)
+status = self.s.glusterVolumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
return status['status']['code'], status['status']['message']
def do_glusterVolumeRemoveBrickStart(self, args):
@@ -825,10 +823,10 @@
'gluster cluster',
'remove server from gluster cluster'
)),
- 'glusterVolumeReplaceBrickCommit': (
- serv.do_glusterVolumeReplaceBrickCommit,
+ 'glusterVolumeReplaceBrickCommitForce': (
+ serv.do_glusterVolumeReplaceBrickCommitForce,
('volumeName= existingBrick= '
- 'newBrick= [force={yes|no}]\n\t'
+ 'newBrick= \n\t'
' is existing volume name\n\t'
' is existing brick\n\t'
' is new brick',
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 2835876..33ed194 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -215,12 +215,11 @@
return self.svdsmProxy.glusterVolumeRebalanceStatus(volumeName)
@exportAsVerb
-def volumeReplaceBrickCommit(self, volumeName, existingBrick, newBrick,
- force=False, options=None):
-self.svdsmProxy.glusterVolumeReplaceBrickCommit(volumeName,
-existingBrick,
-newBrick,
-force)
+def volumeReplaceBrickCommitForce(self, volumeName, existingBrick,
+ newBrick, options=None):
+self.svdsmProxy.glusterVolumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
@exportAsVerb
def volumeRemoveBrickStart(self, volumeName, brickList,
diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py
index 578fc92..0a1d16f 100644
--- a/vdsm/gluster/apiwrapper.py
+++ b/vdsm/gluster/apiwrapper.py
@@ -164,6 +164,11 @@
return self._gluster.volumeRemoveBrickForce(volumeName, brickList,
replicaCount)
+def replaceBrickCommitForce(self, volumeName, existingBrick, newBrick):
+return self._gluster.volumeReplaceBrickCommitForce(volumeName,
+ existingBrick,
+ newBrick)
+
def profileInfo(self, volumeName, nfs=False):
return self._gluster.volumeProfileInfo(volumeName, nfs)
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index db9b3fc..8bcb5cb 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -726,18 +726,16 @@
@makePublic
-def volumeReplaceBrickCommit(volumeName, existingBrick, newBrick,
-
Change in vdsm[master]: gluster:Remove support for Replace gluster brick with data m...
Darshan N has posted comments on this change. Change subject: gluster:Remove support for Replace gluster brick with data migration. .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/40545 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1569972120da27c17407bec5301b1ba417ce0768 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: New verb to mount & update fstab for meta-volume
Darshan N has posted comments on this change. Change subject: gluster: New verb to mount & update fstab for meta-volume .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/40497 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2d109a5de9374f21b1b94f73187b653c121a8b4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shubhendu Tripathi Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: verbs to enable/disable snapshot scheduling.
Darshan N has posted comments on this change. Change subject: gluster: verbs to enable/disable snapshot scheduling. .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.ovirt.org/40141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff8f21593921bac18950a9ee42bb3972d278f7aa Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Darshan N Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Timothy Asir Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
