Change in vdsm[master]: caps: Repair collect numa information
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: caps: Repair collect numa information
......................................................................
Patch Set 4: Code-Review-1
(3 comments)
http://gerrit.ovirt.org/#/c/27090/4/vdsm/caps.py
File vdsm/caps.py:
Line 202: Get the memory stats of a specified numa node, the unit is MiB.
Line 203:
Line 204: :param cell: the index of numa node.
Line 205: :type cell: int
Line 206: :return: dict like {'total': '49141', 'free': '46783'}
Thanks for fixing the units. However, the fix is unrelated to this patch. This may confuse reviewers in the future. Please dedicate a new change for it.
Line 207: """
Line 208: cellMemInfo = libvirtconnection.get().getMemoryStats(cell, 0)
Line 209: cellMemInfo['total'] = str(cellMemInfo['total'] / 1024)
Line 210: cellMemInfo['free'] = str(cellMemInfo['free'] / 1024)
http://gerrit.ovirt.org/#/c/27090/4/vdsm_api/vdsmapi-schema.json
File vdsm_api/vdsmapi-schema.json:
Line 721: # @cpus: The cpu ids in this numa node. The cpu id is described in
Line 722: # libvirt's capabilities api. When hyper-thread is enabled,
Line 723: # one cpu core id will correspond to two sibling cpu ids.
Line 724: #
Line 725: # @totalMemory: The total memory of this numa node
Please document the unit here.
Line 726: #
Line 727: # Since: 4.15.0
Line 728: ##
Line 729: {'type': 'NumaNode',
Line 726: #
Line 727: # Since: 4.15.0
Line 728: ##
Line 729: {'type': 'NumaNode',
Line 730: 'data': {'cpus': ['uint'], 'totalMemory': 'str'}}
It is confusing and counterintuitive, but please keep this as "uint" despite the actual type passed via xmlrpc (other similar numbers have the same odd behavior).
Line 731:
Line 732: ##
Line 733: # @HookScriptInfo:
Line 734: #
--
To view, visit http://gerrit.ovirt.org/27090
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifb70231c81e75d29107f4ea89367aa33d8e85bad
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
9 years, 11 months
Change in vdsm[master]: spec: Add numactl dependency in spec file
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spec: Add numactl dependency in spec file
......................................................................
Patch Set 2:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/554/ : FAILURE
--
To view, visit http://gerrit.ovirt.org/27233
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2257acef9b2aa67d1457cf4b59dc377218720223
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years, 11 months
Change in vdsm[master]: spec: Add numactl dependency in spec file
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: spec: Add numactl dependency in spec file
......................................................................
spec: Add numactl dependency in spec file
Add numactl package dependency in vdsm spec files. This package is
needed by vdsm numa feature.
Change-Id: I2257acef9b2aa67d1457cf4b59dc377218720223
Bug-Url: https://bugzilla.redhat.com/1069303
Signed-off-by: Bruce Shi <xiao-lei.shi(a)hp.com>
Reviewed-on: http://gerrit.ovirt.org/27233
Reviewed-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M debian/control
M vdsm.spec.in
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, but someone else must approve
Douglas Schilling Landgraf: Looks good to me, but someone else must approve
Vinzenz Feenstra: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Xiaolei Shi: Verified
--
To view, visit http://gerrit.ovirt.org/27233
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2257acef9b2aa67d1457cf4b59dc377218720223
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
9 years, 11 months
Change in vdsm[master]: tasks: loadDumpedTasks shouldn't queue tasks
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: tasks: loadDumpedTasks shouldn't queue tasks
......................................................................
tasks: loadDumpedTasks shouldn't queue tasks
loadDumpedTasks should just load the tasks in the unqueuedTasks list.
It is a subsequent call to recoverDumpedTasks that is in charge to queue
the recovery (queueRecovery and _queueTask).
Change-Id: I0f7386f0944f711a1b0a440e86b7ef4bfabc46d7
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/storage/taskManager.py
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/27041/1
diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py
index 4a7a04f..3771873 100644
--- a/vdsm/storage/taskManager.py
+++ b/vdsm/storage/taskManager.py
@@ -206,7 +206,6 @@
t.setPersistence(store,
str(t.persistPolicy),
str(t.cleanPolicy))
- self._tasks[taskID] = t
self._unqueuedTasks.append(t)
except Exception:
self.log.error("taskManager: Skipping directory: %s",
--
To view, visit http://gerrit.ovirt.org/27041
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f7386f0944f711a1b0a440e86b7ef4bfabc46d7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months
Change in vdsm[ovirt-3.3]: libvirt_configure: persist /etc/libvirt/qemu-sanlock.conf
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: libvirt_configure: persist /etc/libvirt/qemu-sanlock.conf
......................................................................
libvirt_configure: persist /etc/libvirt/qemu-sanlock.conf
Fix missing persist of qemu-sanlock.conf file which affects
vdsm start when validating if the file were previously
configured.
Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/27335/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index ea0500c..df009f1b 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -292,7 +292,7 @@
if isOvirtNode; then
. /usr/libexec/ovirt-functions
- ovirt_store_config "${lconf}" "${qconf}" "${ldconf}" "${llogr}"
+ ovirt_store_config "${lconf}" "${qconf}" "${ldconf}" "${llogr}" "${qlconf}"
fi
/usr/bin/vdsm-tool libvirt-configure-services-restart || return 1
--
To view, visit http://gerrit.ovirt.org/27335
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
9 years, 11 months
Change in vdsm[ovirt-3.4]: vdsm-reg: eliminate the VDSMBRIDGE macro
by Douglas Schilling Landgraf
Hello Yaniv Bronhaim, Antoni Segura Puimedon, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/27320
to review the following change.
Change subject: vdsm-reg: eliminate the VDSMBRIDGE macro
......................................................................
vdsm-reg: eliminate the VDSMBRIDGE macro
VDSMBRIDGE is a historical macro holding the "management bridge" of
Vdsm. Nowadays, this bridge may well not exist as management network are
better kept bridge-less. The concept of "management bridge" is currently
used only within vdsm-reg, and only when it needs to register to a legacy
oVirt-Engine that expects the bridge to exist.
This patch hides the unneeded macro within vdsm-reg, to be completely
dropped when vdsm-reg is replaced by an ovirt-node-register utility.
Change-Id: Iaa1dae084ae9df44c10e0f6ae43584544dab2b8d
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/24814
Reviewed-by: Antoni Segura Puimedon <asegurap(a)redhat.com>
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Tested-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M configure.ac
M vdsm_reg/deployUtil.py.in
M vdsm_reg/vdsm-reg-setup.in
3 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/27320/1
diff --git a/configure.ac b/configure.ac
index 8400b0f..485bcf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,9 +143,6 @@
AC_SUBST([vdsmreglogdir], ['${localstatedir}/log/vdsm-reg'])
AC_SUBST([vdsmupgradedir], ['/data/updates'])
-# Network
-AC_SUBST([VDSMBRIDGE], ['ovirtmgmt'])
-
# Engine Name
AC_SUBST([ENGINENAME], ['oVirt Engine'])
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index ba45d64..3e16557 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -85,7 +85,7 @@
SCRIPT_NAME_ADD = "addNetwork"
SCRIPT_NAME_DEL = "delNetwork"
IFACE_CONFIG = "/etc/sysconfig/network-scripts/ifcfg-"
-MGT_BRIDGE_NAME = "@VDSMBRIDGE@"
+MGT_BRIDGE_NAME = "ovirtmgmt"
REMOTE_SSH_KEY_FILE = ('/engine.ssh.key.txt',)
CORE_DUMP_PATH = '/var/lib/vdsm/core'
CORE_PATTERN = '/proc/sys/kernel/core_pattern'
@@ -470,7 +470,7 @@
def preventDuplicate(bridgeName=None):
"""
- This function checks if the needed bridge (@VDSMBRIDGE@) already exist.
+ This function checks if the needed MGT_BRIDGE_NAME already exist.
"""
if bridgeName is None:
bridgeName = MGT_BRIDGE_NAME
@@ -1005,8 +1005,8 @@
def makeBridge(vdcName, vdsmDir, bridgeName=None):
"""
- Create (for RHEL) or rename (oVirt default bridge) to @VDSMBRIDGE@
- bridge.
+ Create (for RHEL) or rename (oVirt default bridge) to
+ MGT_BRIDGE_NAME.
"""
logging.debug('makeBridge begin.')
if bridgeName is None:
diff --git a/vdsm_reg/vdsm-reg-setup.in b/vdsm_reg/vdsm-reg-setup.in
index 8b40273..b7d1a9b 100644
--- a/vdsm_reg/vdsm-reg-setup.in
+++ b/vdsm_reg/vdsm-reg-setup.in
@@ -4,7 +4,7 @@
# Output: none.
#
# Steps to perform: Initiate Certificate Initalization
-# a. Find menagement bridge and rename it to @VDSMBRIDGE@.
+# a. Find menagement bridge and rename it to MGT_BRIDGE_NAME.
# b. Create .ssh directory and fetch authorized_keys
# c. Call VDC registration.
# d. Set time according to rhev-m time.
@@ -23,12 +23,12 @@
from config import config
import deployUtil
import createDaemon
+from deployUtil import MGT_BRIDGE_NAME
TICKET_RETRIES=3
DEFAULT_CONFIG_FILE="/etc/vdsm-reg/vdsm-reg.conf"
VDSM_CONF="/etc/vdsm/vdsm.conf"
SCRIPT_NAME_SAVE="vdsm-store-net-config"
-MGT_BRIDGE_NAME="@VDSMBRIDGE@"
class Setup:
"""
@@ -76,7 +76,7 @@
def renameBridge(self):
"""
- Rename oVirt default bridge to @VDSMBRIDGE@ bridge.
+ Rename oVirt-node default bridge to MGT_BRIDGE_NAME.
"""
logging.debug("renameBridge begin.")
fReturn = True
@@ -92,8 +92,10 @@
out, err, ret = deployUtil._logExec([os.path.join(self.vdsmDir, SCRIPT_NAME_SAVE)])
if ret:
fReturn = False
- logging.error("renameBridge Failed to persist @VDSMBRIDGE@ "
- "bridge changes. out=%s\nerr=%s\nret=%d", out, err,
+ logging.error("renameBridge Failed to persist %s "
+ "bridge changes. out=%s\nerr=%s\nret=%d",
+ MGT_BRIDGE_NAME,
+ out, err,
ret)
except:
fReturn = False
--
To view, visit http://gerrit.ovirt.org/27320
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa1dae084ae9df44c10e0f6ae43584544dab2b8d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
9 years, 11 months