From cfff1c5e2a3d6f4cc2a0a73af44db37b4535fabd Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Thu, 21 Jul 2022 14:16:39 +0200 Subject: [PATCH] Bugfix: Remove prometheus flag for daemon during tests --- CHANGELOG.md | 15 ++++++++++----- tests/integration/harness/gkfs.py | 17 ++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bb7e305c..77e538bdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,11 +19,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Additional `#ifdef` to remove unused code ([!141](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141)) ### Removed ### Fixed -- Fix a compilation error for testing ([!234](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/234)). -- Using `unlink` now fails if it is a directory unless the `AT_REMOVEDIR` flag is used (POSIX compliance) ([!139](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/139)). -- fchdir generate a SIGSEV in debug mode (due to log) ([!141](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141)) -- Fix fstatat to be able to understand `AT_EMPTY_PATH` flag used in coreutils (`cat` ...) ([!149](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/149)). -- Fix segfault in sfind/gfind ([!227](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/227) +- Fixed a bug which caused GekkoFS tests to + fail ([!235](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/235)). +- Fixed a compilation error for testing ([!234](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/234)). +- Using `unlink` now fails if it is a directory unless the `AT_REMOVEDIR` flag is used (POSIX + compliance) ([!139](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/139)). +- fchdir generate a SIGSEV in debug mode (due to + log) ([!141](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141)) +- Fixed fstatat to be able to understand `AT_EMPTY_PATH` flag used in coreutils (`cat` + ...) ([!149](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/149)). +- Fixed segfault in sfind/gfind ([!227](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/227) ## [0.9.1] - 2022-04-29 diff --git a/tests/integration/harness/gkfs.py b/tests/integration/harness/gkfs.py index 2ba4ae593..9830e9c3d 100644 --- a/tests/integration/harness/gkfs.py +++ b/tests/integration/harness/gkfs.py @@ -247,15 +247,14 @@ class Daemon: def run(self): - args = [ '--mountdir', self.mountdir, - '--rootdir', self.rootdir, - '-l', self._address, - '--metadir', self._metadir, - '--dbbackend', self._database, - '--output-stats', self.logdir / 'stats.log', - '--enable-collection', - '--enable-chunkstats', - '--enable-prometheus' ] + args = ['--mountdir', self.mountdir, + '--rootdir', self.rootdir, + '-l', self._address, + '--metadir', self._metadir, + '--dbbackend', self._database, + '--output-stats', self.logdir / 'stats.log', + '--enable-collection', + '--enable-chunkstats'] if self._database == "parallaxdb" : args.append('--clean-rootdir-finish') -- GitLab