From 771ed4b3785df3194cf28ed9f1e688e0f59b64b5 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:17:26 +0200 Subject: [PATCH 1/4] refs #2513 support new parameter for Configurar --- .../modules/server/ogAdmClient/__init__.py | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 7bb22b2..eecc855 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -560,8 +560,9 @@ class ogAdmClientWorker (ogLiveWorker): dsk = post_params['dsk'] cfg = post_params['cfg'] ids = post_params['ids'] + check_sizes = str ('check-sizes' in post_params and 'true' == post_params['check-sizes']).lower() - self.muestraMensaje (4) + if 'true' != check_sizes: self.muestraMensaje (4) params = [] disk_info = cfg.pop (0) @@ -582,23 +583,24 @@ class ogAdmClientWorker (ogLiveWorker): cfg_str = f'{disk_info_str}!{part_info_str}%' try: - self.interfaceAdmin (nfn, ['ignored', cfg_str]) - self.muestraMensaje (14) + self.interfaceAdmin (nfn, ['ignored', cfg_str, check_sizes]) + if 'true' != check_sizes: self.muestraMensaje (14) herror = 0 except: logger.warning ('Error al ejecutar el comando') - self.muestraMensaje (13) + if 'true' != check_sizes: self.muestraMensaje (13) herror = 1 - cfg = self.LeeConfiguracion() - if not cfg: - logger.warning ('No se ha podido recuperar la configuración de las particiones del disco') - return {} - cmd = { 'nfn': 'RESPUESTA_Configurar', - 'cfg': self.cfg2obj (cfg), } + if 'true' != check_sizes: + cfg = self.LeeConfiguracion() + if not cfg: + logger.warning ('No se ha podido recuperar la configuración de las particiones del disco') + return {} + cmd['cfg'] = self.cfg2obj (cfg) + self.muestraMenu() return self.respuestaEjecucionComando (cmd, herror, ids) @@ -1008,6 +1010,11 @@ class ogAdmClientWorker (ogLiveWorker): @check_secret def process_Configurar (self, path, get_params, post_params, server): logger.debug ('in process_Configurar, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) + + check_sizes = str ('check-sizes' in post_params and 'true' == post_params['check-sizes']).lower() + if 'true' == check_sizes: + return self.do_Configurar (post_params) + return self._long_running_job ('Configurar', self.do_Configurar, args=(post_params,)) @execution_level('full') From de74923fd89611e1e7273f797b5212db6aa5b165 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:18:13 +0200 Subject: [PATCH 2/4] refs #2513 poll quicker --- src/opengnsys/workers/oglive_worker.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 6e955c9..04ac130 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -292,6 +292,7 @@ class ogLiveWorker(ServerWorker): pass sout = serr = '' + poll_iterations = 1 while p.poll() is None: for l in iter (p.stdout.readline, b''): partial = l.decode ('utf-8', 'ignore') @@ -300,7 +301,13 @@ class ogLiveWorker(ServerWorker): for l in iter (p.stderr.readline, b''): partial = l.decode ('utf-8', 'ignore') serr += partial - time.sleep (1) + + ## poll quickly at first, then poll less frequently + if poll_iterations > 15: sleep_time = 1 + elif poll_iterations > 10: sleep_time = 0.2 + else: sleep_time = 0.1 + time.sleep (sleep_time) + poll_iterations += 1 sout = sout.strip() serr = serr.strip() From f833a31a828ba4c59fdee28496681b719d649d9e Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:18:32 +0200 Subject: [PATCH 3/4] refs #2513 bugfix: do not add empty entries --- src/opengnsys/workers/oglive_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 04ac130..7390bdc 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -432,7 +432,7 @@ class ogLiveWorker(ServerWorker): k, v = item.split ('=', maxsplit=1) elem[k] = v - obj.append (elem) + if elem: obj.append (elem) return obj From fb5cc452cf1e78e44a7c4161a86d48029a2d2036 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:20:19 +0200 Subject: [PATCH 4/4] refs #2513 add versioning stuff --- CHANGELOG.md | 6 ++++++ linux/debian/changelog | 6 ++++++ src/VERSION | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a53cef..cd94da6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.3.0] - 2025-07-18 + +### Added + +- Add new parameter for Configurar + ## [6.2.0] - 2025-07-18 ### Added diff --git a/linux/debian/changelog b/linux/debian/changelog index 86eb080..a613f3a 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +ogagent (6.3.0-1) stable; urgency=medium + + * Add new parameter for Configurar + + -- OpenGnsys developers Fri, 18 Jul 2025 14:20:44 +0200 + ogagent (6.2.0-1) stable; urgency=medium * Add endpoint for GetGitData diff --git a/src/VERSION b/src/VERSION index 6abaeb2..798e389 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -6.2.0 +6.3.0