Make Gerrit retry counter configurable

A new config parameter 'gerrit-retry' is introduced
with default value 10.

Change-Id: I2b7fcd704873cacd147026e9f3bb38e9752cb435
changes/46/337246/1
Ilya Shakhat 7 years ago
parent 38d534fd5a
commit 7cdf1408f0

@ -3,6 +3,7 @@ usage: stackalytics-processor [-h] [--config-dir DIR] [--config-file PATH]
[--days_to_update_members DAYS_TO_UPDATE_MEMBERS]
[--debug] [--default-data-uri DEFAULT_DATA_URI]
[--driverlog-data-uri DRIVERLOG_DATA_URI]
[--gerrit-retry GERRIT_RETRY]
[--git-base-uri GIT_BASE_URI]
[--log-config-append PATH]
[--log-date-format DATE_FORMAT]
@ -44,6 +45,8 @@ optional arguments:
URI for default data
--driverlog-data-uri DRIVERLOG_DATA_URI
URI for default data
--gerrit-retry GERRIT_RETRY
How many times to retry after Gerrit errors
--git-base-uri GIT_BASE_URI
git base location
--log-config-append PATH, --log_config PATH
@ -98,7 +101,7 @@ optional arguments:
Syslog facility to receive log lines. This option is
ignored if log_config_append is set.
--translation-team-uri TRANSLATION_TEAM_URI
URI for translation team data
URI of translation team data
--use-syslog Use syslog for logging. Existing syslog format is
DEPRECATED and will be changed later to honor RFC5424.
This option is ignored if log_config_append is set.

@ -144,7 +144,7 @@
# URI for default data (string value)
#driverlog_data_uri = https://git.openstack.org/cgit/openstack/driverlog/plain/etc/default_data.json
# URI for translation team data (string value)
# URI of translation team data (string value)
#translation_team_uri = https://git.openstack.org/cgit/openstack/i18n/plain/tools/zanata/translation_team.yaml
# How many member profiles to look ahead after the last (integer value)
@ -153,6 +153,9 @@
# Number of seconds to wait for remote response (integer value)
#read_timeout = 120
# How many times to retry after Gerrit errors (integer value)
#gerrit_retry = 10
# The address dashboard listens on (string value)
#listen_host = 127.0.0.1

@ -56,6 +56,8 @@ PROCESSOR_OPTS = [
help='How many member profiles to look ahead after the last'),
cfg.IntOpt('read-timeout', default=120,
help='Number of seconds to wait for remote response'),
cfg.IntOpt('gerrit-retry', default=10,
help='How many times to retry after Gerrit errors'),
]
DASHBOARD_OPTS = [

@ -223,7 +223,8 @@ def process(runtime_storage_inst, record_processor_inst):
rcs_inst = rcs.get_rcs(cfg.CONF.review_uri)
rcs_inst.setup(key_filename=cfg.CONF.ssh_key_filename,
username=cfg.CONF.ssh_username)
username=cfg.CONF.ssh_username,
gerrit_retry=cfg.CONF.gerrit_retry)
for repo in repos:
_process_repo(repo, runtime_storage_inst, record_processor_inst,

@ -26,7 +26,7 @@ DEFAULT_PORT = 29418
GERRIT_URI_PREFIX = r'^gerrit:\/\/'
PAGE_LIMIT = 100
REQUEST_COUNT_LIMIT = 20
SSH_ERRORS_LIMIT = 5
SSH_ERRORS_LIMIT = 10
class RcsException(Exception):
@ -65,6 +65,7 @@ class Gerrit(Rcs):
self.key_filename = None
self.username = None
self.ssh_errors_limit = SSH_ERRORS_LIMIT
self.client = paramiko.SSHClient()
self.client.load_system_host_keys()
@ -76,6 +77,7 @@ class Gerrit(Rcs):
def setup(self, **kwargs):
self.key_filename = kwargs.get('key_filename')
self.username = kwargs.get('username')
self.ssh_errors_limit = kwargs.get('gerrit_retry') or SSH_ERRORS_LIMIT
self._connect()
@ -123,7 +125,7 @@ class Gerrit(Rcs):
raise RcsException(e)
def _exec_command_with_retrial(self, cmd):
while self.error_count < SSH_ERRORS_LIMIT:
while self.error_count < self.ssh_errors_limit:
try:
return self._exec_command(cmd)
except RcsException:

Loading…
Cancel
Save