Change in vdsm[master]: use defined options from configure
by ybronhei＠redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: use defined options from configure
......................................................................
Patch Set 3: -Verified
--
To view, visit http://gerrit.ovirt.org/18694
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic15a03f4f9da6fe1ee881881d1c19d8052cf1e17
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alexey Shabalin <a.shabalin(a)gmail.com>
Gerrit-Reviewer: Alexey Shabalin <a.shabalin(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 4 months
Change in vdsm[master]: use defined options from configure
by ybronhei＠redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: use defined options from configure
......................................................................
Patch Set 3: Verified+1
--
To view, visit http://gerrit.ovirt.org/18694
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic15a03f4f9da6fe1ee881881d1c19d8052cf1e17
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alexey Shabalin <a.shabalin(a)gmail.com>
Gerrit-Reviewer: Alexey Shabalin <a.shabalin(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 4 months
Change in vdsm[master]: threadPool: Do not keep reference to tasks
by Nir Soffer
Nir Soffer has uploaded a new change for review.
Change subject: threadPool: Do not keep reference to tasks
......................................................................
threadPool: Do not keep reference to tasks
WorkerThread used to take a task from the threadpool queue, run it, and
then hold it until the next task is run. This cause task and all objects
referenced from it to keep living unti the next task is run by this
thread. This patch ensure that task are deleted after they are run.
Change-Id: Ib6e024e0727e11a4c98f4e5ede20229d148fdc58
Relates-To: https://bugzilla.redhat.com/1032925
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/storage/threadPool.py
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/22136/1
diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py
index b1f3142..a0e24a2 100644
--- a/vdsm/storage/threadPool.py
+++ b/vdsm/storage/threadPool.py
@@ -191,8 +191,8 @@
it, calling the callback if any. """
while not self.__isDying:
+ id, cmd, args, callback = self.__pool.getNextTask()
try:
- id, cmd, args, callback = self.__pool.getNextTask()
if id is None: # should retry.
pass
elif self.__isDying:
@@ -212,6 +212,11 @@
self.__pool.setRunningTask(False)
except Exception:
self.log.error("Task %s failed" % repr(cmd), exc_info=True)
+ finally:
+ # Don't keep reference to objects taken from the pool.
+ # Otherwise this thread may keep those object alive until the
+ # next iteration. See BZ#1032925.
+ del id, cmd, args, callback
def goAway(self):
--
To view, visit http://gerrit.ovirt.org/22136
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6e024e0727e11a4c98f4e5ede20229d148fdc58
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
10 years, 4 months
Change in vdsm[master]: Revert "vdsm: refactor buildConfDevices and getConfDevices i...
by Nir Soffer
Nir Soffer has uploaded a new change for review.
Change subject: Revert "vdsm: refactor buildConfDevices and getConfDevices into single function"
......................................................................
Revert "vdsm: refactor buildConfDevices and getConfDevices into single function"
This reverts commit 93d09f6567e1dfef2397f83258998666d32c7475.
That commit removed Vm.getConfDevices without updating callers about it,
causing a failure in clientIF._recoverExistingVms. Also recovery process
seems to be broken after this commit, including vm unpausing, that
depends on successful recovery. When reverted, vm unpausing on startup
is working again.
Since this refactoring was not correct, and breaks a feature, it should
be done again more carefully.
Change-Id: I13d07d6de964ecbc7b518fc53adae0b26cef9658
Relates-To: http://gerrit.ovirt.org/21649
Bug-Url: https://bugzilla.redhat.com/1036358
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 52 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/21900/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index b272ca2..295297d 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1884,30 +1884,47 @@
'truesize': 0})
return removables
+ def getConfDevices(self):
+ devices = self._makeDeviceDict()
+ for dev in self.conf.get('devices'):
+ try:
+ devices[dev['type']].append(dev)
+ except KeyError:
+ # Unknown type device found
+ self.log.warn("Unknown type found, device: '%s' found", dev)
+ devices[GENERAL_DEVICES].append(dev)
+
+ # Update indices for drives devices
+ self.normalizeDrivesIndices(devices[DISK_DEVICES])
+
+ return devices
+
def buildConfDevices(self):
"""
Return the "devices" section of this Vm's conf.
If missing, create it according to old API.
"""
- devices = self._makeDeviceDict()
-
# For BC we need to save previous behaviour for old type parameters.
# The new/old type parameter will be distinguished
# by existence/absence of the 'devices' key
+ devices = {}
+ # Build devices structure
if self.conf.get('devices') is None:
+ with self._confLock:
+ self.conf['devices'] = []
devices[DISK_DEVICES] = self.getConfDrives()
devices[NIC_DEVICES] = self.getConfNetworkInterfaces()
devices[SOUND_DEVICES] = self.getConfSound()
devices[VIDEO_DEVICES] = self.getConfVideo()
devices[CONTROLLER_DEVICES] = self.getConfController()
+ devices[GENERAL_DEVICES] = []
+ devices[BALLOON_DEVICES] = []
+ devices[WATCHDOG_DEVICES] = []
+ devices[SMARTCARD_DEVICES] = self.getConfSmartcard()
+ devices[REDIR_DEVICES] = []
+ devices[CONSOLE_DEVICES] = []
else:
- for dev in self.conf.get('devices'):
- try:
- devices[dev['type']].append(dev)
- except KeyError:
- self.log.warn("Unknown type found, device: '%s' "
- "found", dev)
- devices[GENERAL_DEVICES].append(dev)
+ devices = self.getConfDevices()
self._checkDeviceLimits(devices)
@@ -1915,8 +1932,6 @@
for drv in devices[DISK_DEVICES]:
if isVdsmImage(drv):
self._normalizeVdsmImg(drv)
-
- self.normalizeDrivesIndices(devices[DISK_DEVICES])
# Preserve old behavior. Since libvirt add a memory balloon device
# to all guests, we need to specifically request not to add it.
@@ -1972,6 +1987,17 @@
'device': devType})
return vcards
+
+ def getConfSmartcard(self):
+ """
+ Normalize smartcard device (now there is only one)
+ """
+ cards = []
+ if self.conf.get('smartcard'):
+ cards.append({'device': SMARTCARD_DEVICES,
+ 'specParams': {'mode': 'passthrough',
+ 'type': 'spicevmc'}})
+ return cards
def getConfSound(self):
"""
@@ -2036,6 +2062,9 @@
# FIXME: For BC we have now two identical keys: iface = if
# Till the day that conf will not returned as a status anymore.
drv['iface'] = drv.get('iface') or drv.get('if', 'ide')
+
+ # Update indices for drives devices
+ self.normalizeDrivesIndices(confDrives)
return confDrives
@@ -2929,11 +2958,9 @@
def _run(self):
self.log.info("VM wrapper has started")
self.conf['smp'] = self.conf.get('smp', '1')
- devices = self.buildConfDevices()
- # TODO: In recover should loop over disks running on the VM because
- # conf may be outdated if something happened during restart.
if not 'recover' in self.conf:
+ devices = self.buildConfDevices()
self.preparePaths(devices[DISK_DEVICES])
self._prepareTransientDisks(devices[DISK_DEVICES])
# Update self.conf with updated devices
@@ -2951,6 +2978,17 @@
# So, to get proper device objects during VM recovery flow
# we must to have updated conf before VM run
self.saveState()
+ else:
+ # TODO: In recover should loop over disks running on the VM because
+ # conf may be outdated if something happened during restart.
+
+ # For BC we should to keep running VM run after vdsm upgrade.
+ # So, because this vm doesn't have normalize conf we need to build
+ # it in recovery flow
+ if not self.conf.get('devices'):
+ devices = self.buildConfDevices()
+ else:
+ devices = self.getConfDevices()
for drive in devices[DISK_DEVICES]:
if drive['device'] == 'disk' and isVdsmImage(drive):
--
To view, visit http://gerrit.ovirt.org/21900
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13d07d6de964ecbc7b518fc53adae0b26cef9658
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
10 years, 4 months
Change in vdsm[ovirt-3.3]: Allow setting just a single value in MoM policy
by Martin Sivak
Hello Doron Fediuck, Amador Pahim, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/21839
to review the following change.
Change subject: Allow setting just a single value in MoM policy
......................................................................
Allow setting just a single value in MoM policy
This patch prevents a policy coruption that could have happened
when the 01-parameters policy was updated with just a single
value. If there were more values defined, the variables were lost
and the policy ended up broken.
This patch defines the variables in a file that is not touched
by the setMOMPolicyParameters and uses (set name value) syntax
in the generated policy part.
It also remembers the old setting and puts all the values to
the policy part when it is autogenerated.
Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1025780
Change-Id: I7bb1001a05e670e393b2cc0ab4b271b3b333d2e8
Signed-off-by: Martin Sivak <msivak(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/21225
Reviewed-by: Amador Pahim <apahim(a)redhat.com>
Reviewed-by: Doron Fediuck <dfediuck(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M debian/vdsm.install
M vdsm/Makefile.am
A vdsm/mom.d/00-defines.policy
D vdsm/mom.d/00-python.policy
M vdsm/mom.d/01-parameters.policy
M vdsm/momIF.py
6 files changed, 17 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/21839/1
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 6de089e..89b6e6c 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -14,7 +14,7 @@
./etc/sysctl.d/vdsm.conf
./etc/vdsm/logger.conf
./etc/vdsm/mom.conf
-./etc/vdsm/mom.d/00-python.policy
+./etc/vdsm/mom.d/00-defines.policy
./etc/vdsm/mom.d/01-parameters.policy
./etc/vdsm/mom.d/02-balloon.policy
./etc/vdsm/mom.d/03-ksm.policy
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 26be4dc..5ab291e 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -110,7 +110,7 @@
logger.conf.in \
mk_sysprep_floppy.in \
mom.conf.in \
- mom.d/00-python.policy \
+ mom.d/00-defines.policy \
mom.d/01-parameters.policy \
mom.d/02-balloon.policy \
mom.d/03-ksm.policy \
diff --git a/vdsm/mom.d/00-defines.policy b/vdsm/mom.d/00-defines.policy
new file mode 100644
index 0000000..93b70ee
--- /dev/null
+++ b/vdsm/mom.d/00-defines.policy
@@ -0,0 +1,9 @@
+# This file defines python constans that make it easier to convert data
+# received by setMOMPolicyParameters
+(defvar False 0)
+(defvar True 1)
+
+# Define variables for configurable options here
+(defvar ksmEnabled 1)
+(defvar balloonEnabled 0)
+
diff --git a/vdsm/mom.d/00-python.policy b/vdsm/mom.d/00-python.policy
deleted file mode 100644
index face6fa..0000000
--- a/vdsm/mom.d/00-python.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file defines python constans that make it easier to convert data
-# received by setMOMPolicyParameters
-(defvar False 0)
-(defvar True 1)
diff --git a/vdsm/mom.d/01-parameters.policy b/vdsm/mom.d/01-parameters.policy
index 980e71c..e69de29 100644
--- a/vdsm/mom.d/01-parameters.policy
+++ b/vdsm/mom.d/01-parameters.policy
@@ -1 +0,0 @@
-(defvar balloonEnabled 0)
diff --git a/vdsm/momIF.py b/vdsm/momIF.py
index 8b62657..c1e00ef 100644
--- a/vdsm/momIF.py
+++ b/vdsm/momIF.py
@@ -46,6 +46,7 @@
self.log = logging.getLogger("MOM")
self.log.info("Starting up MOM")
self._mom = mom.MOM(momconf)
+ self._policy = {}
threading.Thread.__init__(self, target=self._mom.run, name="MOM")
self.start()
@@ -64,14 +65,16 @@
def setPolicyParameters(self, key_value_store):
# mom.setNamedPolicy will raise an exception on failure.
+
# Prepare in-memory policy file with tuning variables
# this might need to convert certain python types to proper MoM
# policy language
+ self._policy.update(key_value_store)
- # Python bool values are defined in 00-python.policy so need no
+ # Python bool values are defined in 00-defines.policy so need no
# conversion here
- policy_string = "\n".join(["(defvar %s %r)" % (k, v)
- for k, v in key_value_store.iteritems()])
+ policy_string = "\n".join(["(set %s %r)" % (k, v)
+ for k, v in self._policy.iteritems()])
self._mom.setNamedPolicy(config.get("mom", "tuning_policy"),
policy_string)
--
To view, visit http://gerrit.ovirt.org/21839
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb1001a05e670e393b2cc0ab4b271b3b333d2e8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
10 years, 4 months
Change in vdsm[ovirt-3.3]: Allow disable MOM KSM control.
by dfediuck＠redhat.com
Hello Martin Sivák, Amador Pahim, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/22150
to review the following change.
Change subject: Allow disable MOM KSM control.
......................................................................
Allow disable MOM KSM control.
This patch add ksmEnabled var to enable/disable mom ksm control.
Now users can use vdsClient to runtime disable/enable
(default enabled) ksm control:
$ vdsClient -s 0 setMOMPolicyParameters ksmEnabled=False
Change-Id: Icc4333ce92561e23c062c398e24f876a74056a05
Bug-Url: http://bugzilla.redhat.com/1025780
Signed-off-by: Amador Pahim <apahim(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/20879
Reviewed-by: Martin Sivák <msivak(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/mom.d/01-parameters.policy
M vdsm/mom.d/03-ksm.policy
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/22150/1
diff --git a/vdsm/mom.d/01-parameters.policy b/vdsm/mom.d/01-parameters.policy
index 980e71c..97803d5 100644
--- a/vdsm/mom.d/01-parameters.policy
+++ b/vdsm/mom.d/01-parameters.policy
@@ -1 +1,2 @@
(defvar balloonEnabled 0)
+(defvar ksmEnabled 1)
diff --git a/vdsm/mom.d/03-ksm.policy b/vdsm/mom.d/03-ksm.policy
index 415fcfd..5a3b1bd 100644
--- a/vdsm/mom.d/03-ksm.policy
+++ b/vdsm/mom.d/03-ksm.policy
@@ -41,8 +41,8 @@
(defvar ksm_pressure_threshold (* Host.mem_available ksm_free_percent))
(defvar ksm_committed Host.ksm_shareable)
-(if (and (< (+ ksm_pressure_threshold ksm_committed) Host.mem_available)
- (> (Host.StatAvg "mem_free") ksm_pressure_threshold))
+(if (or (and (< (+ ksm_pressure_threshold ksm_committed) Host.mem_available)
+ (> (Host.StatAvg "mem_free") ksm_pressure_threshold)) (not ksmEnabled))
(Host.Control "ksm_run" 0)
{ # else
(Host.Control "ksm_run" 1)
--
To view, visit http://gerrit.ovirt.org/22150
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc4333ce92561e23c062c398e24f876a74056a05
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
10 years, 4 months
Change in vdsm[ovirt-3.3]: vdsm.spec: Remove Obsoletes: python-cpopen
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm.spec: Remove Obsoletes: python-cpopen
......................................................................
vdsm.spec: Remove Obsoletes: python-cpopen
python-cpopen spec obsoletes vdsm-python-cpopen, so vdsm.spec don't
need to obsolete python-cpopen on vdsm.spec. Otherwise, it will
generate a infinity loop during the yum update between these packages.
Change-Id: If5523c3530cbac667ce5c7db4f78543f21778c54
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/22113/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 00f8c70..c08caf8 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -313,7 +313,6 @@
BuildRequires: python2-devel
Provides: python-cpopen = 1.2.3
-Obsoletes: python-cpopen
%description python-cpopen
Python package for creating sub-process in simpler and safer manner by using C
--
To view, visit http://gerrit.ovirt.org/22113
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5523c3530cbac667ce5c7db4f78543f21778c54
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
10 years, 4 months
Change in vdsm[master]: Avoid calling restorecon on a nonexistent dir.
by mtayer＠redhat.com
mooli tayer has uploaded a new change for review.
Change subject: Avoid calling restorecon on a nonexistent dir.
......................................................................
Avoid calling restorecon on a nonexistent dir.
/var/log/core is only created when vdsm service goes up.
If vdsm never ran on the machine we might get:
restorecon: lstat(/var/log/core) failed: No such file or directory
Change-Id: Icd0d14193d9306944649d7ab0ee19edf2ca29ae7
Signed-off-by: Mooli Tayer <mtayer(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/21290/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7730f57..0ad4a46 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -645,7 +645,7 @@
# hack until we replace core dump with abrt
/usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
-/sbin/restorecon -R -v /var/log/core
+/sbin/restorecon -R -v /var/log
%if 0%{?rhel}
if [ "$1" -eq 1 ] ; then
--
To view, visit http://gerrit.ovirt.org/21290
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd0d14193d9306944649d7ab0ee19edf2ca29ae7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
10 years, 4 months
Change in vdsm[master]: vm: Refix vm unpausing during recovery
by Nir Soffer
Nir Soffer has uploaded a new change for review.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
vm: Refix vm unpausing during recovery
Commit 45f3037ca1 should have fixed vm unpausing during recovery, but it
did not because of unfortunate cherry-pick. The original patch was
initializing vm sdIds list when running a vm in recovery mode. This code
path was removed in commit 93d09f6567 which was merged on the same day.
This patch adds back the missing code path and remove leftover comment
about recovery mode.
Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Relates-To: http://gerrit.ovirt.org/21649/
Bug-Url: https://bugzilla.redhat.com/1036358
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/21892/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index b272ca2..80359f5 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -2931,8 +2931,6 @@
self.conf['smp'] = self.conf.get('smp', '1')
devices = self.buildConfDevices()
- # TODO: In recover should loop over disks running on the VM because
- # conf may be outdated if something happened during restart.
if not 'recover' in self.conf:
self.preparePaths(devices[DISK_DEVICES])
self._prepareTransientDisks(devices[DISK_DEVICES])
@@ -2951,7 +2949,7 @@
# So, to get proper device objects during VM recovery flow
# we must to have updated conf before VM run
self.saveState()
-
+ else:
for drive in devices[DISK_DEVICES]:
if drive['device'] == 'disk' and isVdsmImage(drive):
self.sdIds.append(drive['domainID'])
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
10 years, 4 months
Change in vdsm[ovirt-3.3]: Remove verbosity from restorecon hack for /var/log/core.
by mtayer＠redhat.com
Hello Yaniv Bronhaim, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/22021
to review the following change.
Change subject: Remove verbosity from restorecon hack for /var/log/core.
......................................................................
Remove verbosity from restorecon hack for /var/log/core.
vebosity spams consoel during installation.
Change-Id: I862039a6dfeebe38fc5c62276ae98213ef92bd02
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1031109
Signed-off-by: Mooli Tayer <mtayer(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/21888
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/22021/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 00f8c70..d03703b 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -658,7 +658,7 @@
if /usr/sbin/selinuxenabled; then
/usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
fi
-/sbin/restorecon -R -v /var/log/core
+/sbin/restorecon -R /var/log/core >/dev/null 2>&1
# hack until we replace core dump with abrt
%if 0%{?rhel}
--
To view, visit http://gerrit.ovirt.org/22021
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I862039a6dfeebe38fc5c62276ae98213ef92bd02
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
10 years, 4 months
