| mkrizek | |
| jskladan |
| libtaskotron |
When setting up minion, try harder to install latest packages. Since dnf
has not install-or-update, we need to use install --best to achieve
the same. We didn't do that before in case the cache was outdated. Now
we do that, and only if it doesn't work, we drop --best.
Also print the executed command to taskotron-stdio.log to make it more
readable.
I reproduced the problem from T798 locally and this fixes it. Also unit tests adjusted.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/remote_exec.py (14 lines) | |||
| M | testing/test_remote_exec.py (23 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| e6a109a5eeac | 5e4ec7c08fdf | 81e0efba6d52 | Kamil Páral | remote_exec: update to latest packages even when cache is outdated (Show More…) | May 19 2016, 9:49 AM |
| Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Line(s) | 104 | def cmd(self, cmd): | |||
|---|---|---|---|---|---|
| 109 | :returns: returncode of the command | 109 | :returns: returncode of the command | ||
| 110 | :raise TaskotronRemoteProcessError: If the command has non-zero return code and it isn't a | 110 | :raise TaskotronRemoteProcessError: If the command has non-zero return code and it isn't a | ||
| 111 | code of the exitcode directive. | 111 | code of the exitcode directive. | ||
| 112 | :raise TaskotronRemoteTimeoutError: If the remote hasn't sent any output for | 112 | :raise TaskotronRemoteTimeoutError: If the remote hasn't sent any output for | ||
| 113 | :attr:`TIMEOUT`. | 113 | :attr:`TIMEOUT`. | ||
| 114 | ''' | 114 | ''' | ||
| 115 | 115 | | |||
| 116 | log.debug('Running command on remote host: %s', cmd) | 116 | log.debug('Running command on remote host: %s', cmd) | ||
| 117 | # write the executed command also to stdio log, so that it's clear what's happening when | ||||
| 118 | # reading it | ||||
| 119 | self.outstream.write('$ %s\n' % cmd) | ||||
| 117 | 120 | | |||
| 118 | # bufsize=1 means line buffering, which should improve the chance of receiving complete | 121 | # bufsize=1 means line buffering, which should improve the chance of receiving complete | ||
| 119 | # lines. get_pty=True allocates a pseudo-terminal, which is needed to have stdout and | 122 | # lines. get_pty=True allocates a pseudo-terminal, which is needed to have stdout and | ||
| 120 | # stderr interlaced properly (in the exact chronological order) | 123 | # stderr interlaced properly (in the exact chronological order) | ||
| 121 | stdin, stdout, _ = self.ssh.exec_command(cmd, timeout=self.TIMEOUT, bufsize=1, | 124 | stdin, stdout, _ = self.ssh.exec_command(cmd, timeout=self.TIMEOUT, bufsize=1, | ||
| 122 | get_pty=True) | 125 | get_pty=True) | ||
| 123 | 126 | | |||
| 124 | # stdout.channel represents channel for both stdout and stderr | 127 | # stdout.channel represents channel for both stdout and stderr | ||
| Show All 26 Lines | 153 | raise exc.TaskotronRemoteProcessError('Command "%s" on %s@%s exited with code %s' % | |||
| 151 | (cmd, self.username, self.hostname, retcode)) | 154 | (cmd, self.username, self.hostname, retcode)) | ||
| 152 | return retcode | 155 | return retcode | ||
| 153 | 156 | | |||
| 154 | def install_pkgs(self, pkgs): | 157 | def install_pkgs(self, pkgs): | ||
| 155 | '''Install packages via dnf. | 158 | '''Install packages via dnf. | ||
| 156 | 159 | | |||
| 157 | First tries to install packages using ``dnf --cacheonly --best``. Running from cache | 160 | First tries to install packages using ``dnf --cacheonly --best``. Running from cache | ||
| 158 | improves performance, while ``--best`` ensures updating to the latest version. If this | 161 | improves performance, while ``--best`` ensures updating to the latest version. If this | ||
| 159 | doesn't work for some reason, we refresh the cache, drop ``--best`` and try again. | 162 | doesn't work for some reason, we try again with refreshed cache, and if that still | ||
| 163 | doesn't work, we drop ``--best`` to allow for broken deps of latest packages, if there | ||||
| 164 | are older packages with working deps. | ||||
| 160 | 165 | | |||
| 161 | :param list pkgs: A list of packages to be installed (supports any argument that | 166 | :param list pkgs: A list of packages to be installed (supports any argument that | ||
| 162 | ``dnf install`` accepts) | 167 | ``dnf install`` accepts) | ||
| 163 | :raise TaskotronRemoteError: If the command has non-zero return code or times out (see | 168 | :raise TaskotronRemoteError: If the command has non-zero return code or times out (see | ||
| 164 | :meth:`cmd`). | 169 | :meth:`cmd`). | ||
| 165 | ''' | 170 | ''' | ||
| 166 | 171 | | |||
| 167 | pkgs_esc = [pipes.quote(pkg) for pkg in pkgs] | 172 | pkgs_esc = [pipes.quote(pkg) for pkg in pkgs] | ||
| 168 | log.info('Installing %d packages on remote host...', len(pkgs)) | 173 | log.info('Installing %d packages on remote host...', len(pkgs)) | ||
| 169 | try: | 174 | try: | ||
| 170 | self.cmd('dnf --assumeyes --cacheonly --best install %s' % ' '.join(pkgs_esc)) | 175 | self.cmd('dnf --assumeyes --cacheonly --best install %s' % ' '.join(pkgs_esc)) | ||
| 171 | except exc.TaskotronRemoteProcessError as e: | 176 | except exc.TaskotronRemoteProcessError as e: | ||
| 172 | log.debug('Installation failed: %s', e) | 177 | log.debug('Installation failed: %s', e) | ||
| 173 | log.debug('Trying again with forced metadata refresh...') | 178 | log.debug('Trying again with forced metadata refresh...') | ||
| 174 | self.cmd('dnf --assumeyes --refresh install %s' % ' '.join(pkgs_esc)) | 179 | try: | ||
| 180 | self.cmd('dnf --assumeyes --refresh --best install %s' % ' '.join(pkgs_esc)) | ||||
| 181 | except exc.TaskotronRemoteError as e: | ||||
| 182 | log.debug('Installation failed: %s', e) | ||||
| 183 | log.debug('Trying again without --best...') | ||||
| 184 | self.cmd('dnf --assumeyes install %s' % ' '.join(pkgs_esc)) | ||||
| 175 | 185 | | |||
| 176 | def write_file(self, remote_path, data, overwrite=True, debug=True): | 186 | def write_file(self, remote_path, data, overwrite=True, debug=True): | ||
| 177 | '''Write data to a remote file. | 187 | '''Write data to a remote file. | ||
| 178 | 188 | | |||
| 179 | :param str remote_path: A path to the remote file | 189 | :param str remote_path: A path to the remote file | ||
| 180 | :param str data: Data to be written | 190 | :param str data: Data to be written | ||
| 181 | :param bool overwrite: Whether to overwrite remote path. Default is True. | 191 | :param bool overwrite: Whether to overwrite remote path. Default is True. | ||
| 182 | :param bool debug: Whether print out debugging log messages about what's happening. | 192 | :param bool debug: Whether print out debugging log messages about what's happening. | ||
| ▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines | |||||
| Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Line(s) | 249 | def test_install_pkgs_try_twice(self): | |||
|---|---|---|---|---|---|
| 250 | '''If the first execution fails, modify dnf options and try again''' | 250 | '''If the first execution fails, modify dnf options and try again''' | ||
| 251 | err = TaskotronRemoteProcessError() | 251 | err = TaskotronRemoteProcessError() | ||
| 252 | self.remote.cmd = mock.Mock(side_effect=[err, 0]) | 252 | self.remote.cmd = mock.Mock(side_effect=[err, 0]) | ||
| 253 | pkgs = ['libtaskotron', 'rpmlint'] | 253 | pkgs = ['libtaskotron', 'rpmlint'] | ||
| 254 | self.remote.install_pkgs(pkgs) | 254 | self.remote.install_pkgs(pkgs) | ||
| 255 | 255 | | |||
| 256 | assert self.remote.cmd.call_count == 2 | 256 | assert self.remote.cmd.call_count == 2 | ||
| 257 | cmd1 = self.remote.cmd.call_args_list[0][0][0] | 257 | cmd1 = self.remote.cmd.call_args_list[0][0][0] | ||
| 258 | words1 = ['dnf', 'install', '--cacheonly', '--best'] + pkgs | 258 | words1 = ['dnf', 'install', '--assumeyes', '--cacheonly', '--best'] + pkgs | ||
| 259 | assert all([word in cmd1 for word in words1]) | 259 | assert all([word in cmd1 for word in words1]) | ||
| 260 | cmd2 = self.remote.cmd.call_args_list[1][0][0] | 260 | cmd2 = self.remote.cmd.call_args_list[1][0][0] | ||
| 261 | words2 = ['dnf', 'install', '--refresh'] + pkgs | 261 | words2 = ['dnf', 'install', '--assumeyes', '--refresh', '--best'] + pkgs | ||
| 262 | not_words2 = ['--cacheonly'] | ||||
| 262 | assert all([word in cmd2 for word in words2]) | 263 | assert all([word in cmd2 for word in words2]) | ||
| 264 | assert all([word not in cmd2 for word in not_words2]) | ||||
| 265 | | ||||
| 266 | def test_install_pkgs_try_three_times(self): | ||||
| 267 | '''If the first two executions fail, modify dnf options and try again''' | ||||
| 268 | err = TaskotronRemoteProcessError() | ||||
| 269 | self.remote.cmd = mock.Mock(side_effect=[err, err, 0]) | ||||
| 270 | pkgs = ['libtaskotron', 'rpmlint'] | ||||
| 271 | self.remote.install_pkgs(pkgs) | ||||
| 272 | | ||||
| 273 | assert self.remote.cmd.call_count == 3 | ||||
| 274 | # first two cmdline args were tested in test_install_pkgs_try_twice() | ||||
| 275 | cmd3 = self.remote.cmd.call_args_list[2][0][0] | ||||
| 276 | words3 = ['dnf', 'install', '--assumeyes'] + pkgs | ||||
| 277 | not_words3 = ['--cacheonly', '--refresh', '--best'] | ||||
| 278 | assert all([word in cmd3 for word in words3]) | ||||
| 279 | assert all([word not in cmd3 for word in not_words3]) | ||||
| 263 | 280 | | |||
| 264 | def test_install_pkgs_fail(self): | 281 | def test_install_pkgs_fail(self): | ||
| 265 | self.remote.cmd = mock.Mock(side_effect=TaskotronRemoteProcessError()) | 282 | self.remote.cmd = mock.Mock(side_effect=TaskotronRemoteProcessError()) | ||
| 266 | with pytest.raises(TaskotronRemoteProcessError): | 283 | with pytest.raises(TaskotronRemoteProcessError): | ||
| 267 | self.remote.install_pkgs(['libtaskotron', 'rpmlint']) | 284 | self.remote.install_pkgs(['libtaskotron', 'rpmlint']) | ||
| 268 | assert self.remote.cmd.call_count == 2 | 285 | assert self.remote.cmd.call_count == 3 | ||