Change in vdsm[master]: glusterHostsList returns host info as list of dictionaries
by barumuga@redhat.com
Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/6614
to review the following change.
Change subject: glusterHostsList returns host info as list of dictionaries
......................................................................
glusterHostsList returns host info as list of dictionaries
{'status': {'code': CODE, 'message': MESSAGE},
'hosts' : [{'hostname': HOSTNAME, 'uuid': UUID,
'status': STATE}, ...]}
Change-Id: Ia05d59020bd4019dab2020988dc621d026b805b6
Signed-off-by: Bala.FA <barumuga(a)redhat.com>
---
M tests/gluster_cli_tests.py
M vdsm/gluster/api.py
M vdsm/gluster/cli.py
3 files changed, 19 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/6614/1
--
To view, visit http://gerrit.ovirt.org/6614
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia05d59020bd4019dab2020988dc621d026b805b6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Bala.FA <barumuga(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: BZ#845994 VM failed to start after file injection.
by ghammer@redhat.com
Gal Hammer has uploaded a new change for review.
Change subject: BZ#845994 VM failed to start after file injection.
......................................................................
BZ#845994 VM failed to start after file injection.
The "before_vm_start" hook created a file inside the guest's
image file using the GuestFS library. The image was not unmounted
explicitly and this caused libvirt to fail when it tried to read
the image file.
Change-Id: Ibb705a7153b1d2662a1c113bbbb5c694c568cabd
Signed-off-by: Gal Hammer <ghammer(a)redhat.com>
---
M vdsm_hooks/fileinject/before_vm_start.py
1 file changed, 25 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/6956/1
--
To view, visit http://gerrit.ovirt.org/6956
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb705a7153b1d2662a1c113bbbb5c694c568cabd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Gal Hammer <ghammer(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: cleanup: bootstrap: cleanup file cleanup function
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: cleanup: bootstrap: cleanup file cleanup function
......................................................................
cleanup: bootstrap: cleanup file cleanup function
Use for instead of repeating code.
Change-Id: I4bcec8004e38051b3e2ffd1812065ae61fc83c6e
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 14 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/7090/1
--
To view, visit http://gerrit.ovirt.org/7090
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bcec8004e38051b3e2ffd1812065ae61fc83c6e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: bootstrap: sync logging between two phases
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: sync logging between two phases
......................................................................
bootstrap: sync logging between two phases
1. Create logs on environ["OVIRT_LOGDIR"] or /tmp
2. Create logs by timestamp and not random.
3. Sync file name and content format.
Change-Id: Iac3faeeaa9e85d92e1d8bcec6517745a665a3da8
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vds_bootstrap/vds_bootstrap.py
M vds_bootstrap/vds_bootstrap_complete.py
2 files changed, 26 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/7089/1
--
To view, visit http://gerrit.ovirt.org/7089
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3faeeaa9e85d92e1d8bcec6517745a665a3da8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: fix crash when sync with libvirt network
by zhshzhou@linux.vnet.ibm.com
Zhou Zheng Sheng has uploaded a new change for review.
Change subject: fix crash when sync with libvirt network
......................................................................
fix crash when sync with libvirt network
When sync with libvirt network, vdsm finds out networks in libvirt whose
corresponding bridge is not existed, then vdsm deletes those networks. vdsm
creates a dir for storing the deleted network config as backups. It chown
the dir to vdsm:root, but the process runs as vdsm:kvm, so this leads to
an Exception. The sync is run in clientIF.__init__, so the Exception causes
vdsmd crashing on start.
So this patch chown the dir to vdsm:kvm, then vdsmd starts OK.
Change-Id: I4a3ea0303656cba87bf17b14929fe59bf0d46337
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
M vdsm/configNetwork.py
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/7156/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 9dffcdd..5ce3cf6 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -212,12 +212,14 @@
# original copy already backed up
return
- vdsm_uid = pwd.getpwnam('vdsm').pw_uid
+ pwdEntry = pwd.getpwnam('vdsm')
+ vdsm_uid = pwdEntry.pw_uid
+ vdsm_gid = pwdEntry.pw_gid
# make directory (if it doesn't exist) and assign it to vdsm
if not os.path.exists(dirName):
os.makedirs(dirName)
- os.chown(dirName, vdsm_uid, 0)
+ os.chown(dirName, vdsm_uid, vdsm_gid)
open(backup, 'w').write(content)
os.chown(backup, vdsm_uid, 0)
--
To view, visit http://gerrit.ovirt.org/7156
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a3ea0303656cba87bf17b14929fe59bf0d46337
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: BZ#846604 Check if NTPd is up before clock sync.
by apahim@redhat.com
Amador Pahim has uploaded a new change for review.
Change subject: BZ#846604 Check if NTPd is up before clock sync.
......................................................................
BZ#846604 Check if NTPd is up before clock sync.
During boostrap, host clock is syncronized with
engine time. If ntpd is running on host, time
in host will jump to engine time and jump back
to ntp time few moments later (when engine time
is not in sync with ntp time).
This patch checks if ntpd is running in order to
skip clock sync, if yes.
Change-Id: Ie594dfef430c811f920f304c5182be9e34f6fbf1
Signed-off-by: Amador Pahim <apahim(a)redhat.com>
---
M configure.ac
M vdsm_reg/deployUtil.py.in
2 files changed, 22 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/7070/1
--
To view, visit http://gerrit.ovirt.org/7070
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie594dfef430c811f920f304c5182be9e34f6fbf1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: bootstrap: search own ssh key without base64 suffix
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: search own ssh key without base64 suffix
......................................................................
bootstrap: search own ssh key without base64 suffix
The '==' is base64 suffix, it may or may not exist based on the key
size, searching by ' ' and suffix should be sufficient.
Line end should be part of suffix, as each key is placed within its own
line.
Change-Id: Id7d75b498ff073bac845bc45fb23ab976d6341f7
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/7088/1
--
To view, visit http://gerrit.ovirt.org/7088
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7d75b498ff073bac845bc45fb23ab976d6341f7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: configNetworkTests: use context to manage monkey patches
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: configNetworkTests: use context to manage monkey patches
......................................................................
configNetworkTests: use context to manage monkey patches
Easier to manage setup and cleanup at on place, then
trying to cleanup after a block of code, and catching
all exceptions.
Example of use:
---
def f():
@contextlib.contextmanager
def context():
oldExists = os.path.exists
os.path.exists = self._bondingOptExists
try:
yield {}
finally:
os.path.exists = oldExists
with context() as value:
logic
---
Change-Id: I2ecb4589f2edbf605e62a8963889d314c2535537
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M tests/configNetworkTests.py
1 file changed, 115 insertions(+), 98 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/6939/1
--
To view, visit http://gerrit.ovirt.org/6939
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ecb4589f2edbf605e62a8963889d314c2535537
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: configNetwork: Ignore libvirt exception for network removing
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: configNetwork: Ignore libvirt exception for network removing
......................................................................
configNetwork: Ignore libvirt exception for network removing
We need to ignore libvirt exception for removing non-exists network
during connectivityCheck rollback in setupNetworks
Change-Id: Ieb2044ddfa2cd4e194ad2315eceb9a815aa164fd
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/7062/1
--
To view, visit http://gerrit.ovirt.org/7062
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb2044ddfa2cd4e194ad2315eceb9a815aa164fd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Restart network service during restore backups
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: Restart network service during restore backups
......................................................................
Restart network service during restore backups
Change-Id: I3d7357a75fc7fbe4af8d5e8654034367512698d1
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/7144/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index e86e0c7..f6f5130 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -278,15 +278,12 @@
def restoreAtomicBackup(self):
logging.info("Rolling back configuration (restoring atomic backup)")
- if not self._backups:
- return
for confFile, content in self._backups.iteritems():
if content is None:
utils.rmFile(confFile)
else:
open(confFile, 'w').write(content)
logging.info('Restored %s', confFile)
- subprocess.Popen(['/etc/init.d/network', 'start'])
@classmethod
def _persistentBackup(cls, filename):
@@ -332,9 +329,20 @@
def restoreBackups(self):
""" Restore network backups """
+ if not self._backups and not self._networksBackups:
+ return
+
+ subprocess.Popen(['/etc/init.d/network', 'stop'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE).communicate()
+
self.restoreAtomicNetworkBackup()
self.restoreAtomicBackup()
+ subprocess.Popen(['/etc/init.d/network', 'start'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE).communicate()
+
@classmethod
def clearBackups(cls):
""" Clear backup files """
--
To view, visit http://gerrit.ovirt.org/7144
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d7357a75fc7fbe4af8d5e8654034367512698d1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 10 months