Change in vdsm[master]: jsonrpc: Vdsm changes
by ybronhei＠redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: jsonrpc: Vdsm changes
......................................................................
Patch Set 25:
(3 comments)
http://gerrit.ovirt.org/#/c/19497/25/lib/yajsonrpc/betterAsyncore.py
File lib/yajsonrpc/betterAsyncore.py:
Line 115: return SSLSocket(SSL.Connection(context, sock=sock), self)
Line 116:
Line 117:
Line 118: # This is a copy of the standard library asyncore converted to support
Line 119: # compositing. Also fixes races in original implementation.
just want explanation here.. what fixes?.. :/
Line 120: class AsyncChat(object):
Line 121: # these are overridable defaults
Line 122:
Line 123: ac_in_buffer_size = 4096
http://gerrit.ovirt.org/#/c/19497/25/lib/yajsonrpc/protonReactor.py
File lib/yajsonrpc/protonReactor.py:
Line 25: FAILED = 0
Line 26: CONNECTED = 1
Line 27: SERVER_AUTH = 2
Line 28: CLIENT_AUTH = 3
Line 29:
why 10?
Line 30: MBUFF_SIZE = 10
Line 31:
Line 32:
Line 33: class ProtonError(RuntimeError):
http://gerrit.ovirt.org/#/c/19497/25/vdsm_api/BindingJsonRpc.py
File vdsm_api/BindingJsonRpc.py:
Line 72:
Line 73: def _createProtonListener(self, cfg):
Line 74: address = cfg.get("host", "0.0.0.0")
Line 75: port = cfg.get("port", 5672)
Line 76: return self._reactors["amqp"].createListener((address, port))
port is hardcoded?
Line 77:
Line 78: def _createTcpReactor(self, truststore_path=None):
Line 79: if truststore_path is None:
Line 80: return AsyncoreReactor()
--
To view, visit http://gerrit.ovirt.org/19497
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If828355b7efe28fe6a2e784069425fefd2f3f25c
Gerrit-PatchSet: 25
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
10 years, 3 months
Change in vdsm[master]: vdsm: Adding guest agent API versioning support
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: vdsm: Adding guest agent API versioning support
......................................................................
vdsm: Adding guest agent API versioning support
With the increasing complexity on different version of the guest agent
and vdsm we're now introducing API versioning, so only supported messages
are exchanged between guest agent and vdsm.
Change-Id: I9095b528c2c910f12d5f170088a458bf11c71910
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M vdsm/guestIF.py
1 file changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/17004/1
diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py
index dae4c3b..02e44d9 100644
--- a/vdsm/guestIF.py
+++ b/vdsm/guestIF.py
@@ -26,6 +26,8 @@
import supervdsm
import unicodedata
+_MAX_SUPPORTED_API_VERSION = 0
+
__REPLACEMENT_CHAR = u'\ufffd'
__RESTRICTED_CHARS = set(range(8 + 1)). \
union(set(range(0xB, 0xC + 1))). \
@@ -97,6 +99,7 @@
def __init__(self, socketName, channelListener, log, user='Unknown',
ips='', connect=True):
+ self.apiVersion = 0
self.log = log
self._socketName = socketName
self._stopped = True
@@ -126,6 +129,26 @@
self._onChannelTimeout,
self)
+ def _setAPIVersion(self, version):
+ try:
+ version = int(version)
+ except ValueError:
+ self.log.error("Received invalid version value: %s", version)
+
+ if version > _MAX_SUPPORTED_API_VERSION:
+ # This actually is not supposed to happen, as the guest agent
+ # is not supposed to send a higher version than requested.
+ # We'll just for our highest version.
+ version = _MAX_SUPPORTED_API_VERSION
+
+ if version < 0:
+ version = 0
+
+ if self.apiVersion != version:
+ self.log.info("Guest API version changed from %d to %d",
+ self.apiVersion, version)
+ self.apiVersion = version
+
def _prepare_socket(self):
supervdsm.getProxy().prepareVmChannel(self._socketName)
@@ -148,7 +171,8 @@
self.log.debug("Connected to %s", self._socketName)
self._messageState = MessageState.NORMAL
self._clearReadBuffer()
- self._forward('refresh')
+ self._forward('refresh',
+ args={'apiVersion': _MAX_SUPPORTED_API_VERSION})
self._stopped = False
ret = True
else:
@@ -183,6 +207,8 @@
self.guestInfo['guestName'] = args['name']
elif message == 'os-version':
self.guestInfo['guestOs'] = args['version']
+ elif message == 'api-version':
+ self._setAPIVersion(args['apiVersion'])
elif message == 'network-interfaces':
interfaces = []
old_ips = ''
--
To view, visit http://gerrit.ovirt.org/17004
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9095b528c2c910f12d5f170088a458bf11c71910
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: get max_tasks and thread_pool_size from config by getint()
by shaohef＠linux.vnet.ibm.com
ShaoHe Feng has uploaded a new change for review.
Change subject: get max_tasks and thread_pool_size from config by getint()
......................................................................
get max_tasks and thread_pool_size from config by getint()
It is OK to get max_tasks and thread_pool_size by getfloat()
The max_tasks will be passed to the Queue as maxsize and the
thread_pool_size is the thread number of the task thread pool.
So int is more reasonable than float
Change-Id: I9fc719b1b4238b0df2d9c882777cb75d7a27d4df
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
M vdsm/storage/storage_mailbox.py
M vdsm/storage/taskManager.py
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/9035/1
diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py
index c537883..1c8700d 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/vdsm/storage/storage_mailbox.py
@@ -208,9 +208,9 @@
def __init__(self, inbox, outbox, hostID, queue, monitorInterval):
# Save arguments
- tpSize = config.getfloat('irs', 'thread_pool_size') / 2
+ tpSize = config.getint('irs', 'thread_pool_size') / 2
waitTimeout = 3
- maxTasks = config.getfloat('irs', 'max_tasks')
+ maxTasks = config.getint('irs', 'max_tasks')
self.tp = ThreadPool(tpSize, waitTimeout, maxTasks)
self._stop = False
self._flush = False
@@ -466,9 +466,9 @@
self._stopped = False
self._poolID = str(pool.spUUID)
self._spmStorageDir = pool.storage_repository
- tpSize = config.getfloat('irs', 'thread_pool_size') / 2
+ tpSize = config.getint('irs', 'thread_pool_size') / 2
waitTimeout = 3
- maxTasks = config.getfloat('irs', 'max_tasks')
+ maxTasks = config.getint('irs', 'max_tasks')
self.tp = ThreadPool(tpSize, waitTimeout, maxTasks)
# *** IMPORTANT NOTE: The SPM's inbox is the HSMs' outbox and vice versa *** #
self._inbox = os.path.join(self._spmStorageDir, self._poolID, "mastersd", sd.DOMAIN_META_DATA, "inbox")
diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py
index 3bc12f3..f7a5da2 100644
--- a/vdsm/storage/taskManager.py
+++ b/vdsm/storage/taskManager.py
@@ -31,9 +31,9 @@
log = logging.getLogger('TaskManager')
def __init__(self,
- tpSize=config.getfloat('irs', 'thread_pool_size'),
+ tpSize=config.getint('irs', 'thread_pool_size'),
waitTimeout=3,
- maxTasks=config.getfloat('irs', 'max_tasks')):
+ maxTasks=config.getint('irs', 'max_tasks')):
self.storage_repository = config.get('irs', 'repository')
self.tp = ThreadPool(tpSize, waitTimeout, maxTasks)
self._tasks = {}
--
To view, visit http://gerrit.ovirt.org/9035
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fc719b1b4238b0df2d9c882777cb75d7a27d4df
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
10 years, 3 months
Change in vdsm[master]: New before_device_create/before_nic_hotplug hook: privatevlan
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: New before_device_create/before_nic_hotplug hook: privatevlan
......................................................................
Patch Set 2:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6256/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7035/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7146/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24219
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9d7ff676ced467b98f5d4ca42c7896748637e55b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: privatevlan: cleaned up README
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: privatevlan: cleaned up README
......................................................................
Patch Set 1: Code-Review-1
Could you squash these patches onto your first one? Reviewers are interested only in the final revision of the hook's api and readme.
--
To view, visit http://gerrit.ovirt.org/24221
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I48de91f8daf564dcd8fc694bacf3dc163d33e31b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: privatevlan: cleaned up README
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: privatevlan: cleaned up README
......................................................................
Patch Set 1:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6253/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7032/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7143/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24221
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I48de91f8daf564dcd8fc694bacf3dc163d33e31b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: privatevlan: significant cleanup of before_device_create hook
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: privatevlan: significant cleanup of before_device_create hook
......................................................................
Patch Set 1:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6254/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7033/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7144/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24222
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id969c92ca814ffda8dc46318b31e63ab73796611
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: privatevlan: pep8 annoyances
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: privatevlan: pep8 annoyances
......................................................................
Patch Set 1:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6255/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7034/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7145/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24223
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I14a66c37af59687ec3227a00e229b53a5c136dfd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: privatevlan: Renamed gw_macs to allowed_macs
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: privatevlan: Renamed gw_macs to allowed_macs
......................................................................
Patch Set 1:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6252/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7031/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7142/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24220
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I910db4142e5ba39c1f3bb512196f10f99bfc4a63
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: New before_device_create/before_nic_hotplug hook: privatevlan
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: New before_device_create/before_nic_hotplug hook: privatevlan
......................................................................
Patch Set 2:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6250/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7029/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/333/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7140/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/24195
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Idda6f193c0095241bc1540a0241d49426c000fb3
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Michael Samuel <mik(a)miknet.net>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
