debug

yandex · Dec 6, 2024 · dd93ace · dd93ace
1 parent 4b1fd6c
commit dd93ace
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 507 deletions.
diff --git a/Makefile b/Makefile
@@ -78,9 +78,9 @@ export DEB_BUILD_DISTRIBUTION ?=
 
 
 define ensure_poetry
-	if [ ! -e $(POETRY) ]; then
-	  echo "Poetry could not be found. Please install it manually 'make install-poetry'";
-	  exit 1;
+	if [ ! -e $(POETRY) ]; then \
+	  echo "Poetry could not be found. Please install it manually 'make install-poetry'"; \
+	  exit 1; \
 	fi
 endef
 
@@ -203,9 +203,9 @@ test-unit: install-deps
 
 .PHONY: test-integration
 test-integration: install-deps build-python-packages
-	cd $(TESTS_DIR)
-	export PYTHONPATH=$(CURDIR):$$PATH
-	$(POETRY) run behave --show-timings --stop --junit $(BEHAVE_ARGS)
+	cd $(TESTS_DIR) && \
+	export PYTHONPATH=$(CURDIR):$$PATH && \
+	$(POETRY) run behave --show-timings --stop --junit $(BEHAVE_ARGS) -i monrun.feature
 
 
 .PHONY: publish

diff --git a/ch_tools/common/config.py b/ch_tools/common/config.py
@@ -84,6 +84,10 @@
                     "pattern": "\n",
                     "replacement": " ",
                 },
+                {
+                    "pattern": r"(Code:\s\d+\.\sDB::Exception:\s).*(\s\([A-Z_]*\)\s\(version\s.*\s\(official build\)\)\s).*",
+                    "replacement": r"\1...\2...",
+                },
             ],
         },
     },

diff --git a/ch_tools/monrun_checks/ch_orphaned_objects.py b/ch_tools/monrun_checks/ch_orphaned_objects.py
@@ -1,5 +1,3 @@
-import re
-
 import click
 
 from ch_tools.chadmin.cli.object_storage_group import STATE_LOCAL_PATH
@@ -9,8 +7,6 @@
 from ch_tools.chadmin.internal.zookeeper import get_zk_node
 from ch_tools.common.result import CRIT, OK, WARNING, Result
 
-ERROR_MESSAGE_PATTERN = r"(Code:\s\d+\.\sDB::Exception:\s).*(\s\([A-Z_]*\)\s\(version\s.*\s\(official build\)\)\s).*"
-
 
 @click.command("orphaned-objects")
 @click.option(
@@ -56,7 +52,7 @@ def orphaned_objects_command(
         return Result(CRIT, str(e))
 
     total_size = state.orphaned_objects_size
-    error_msg = _error_message_format(state.error_msg)
+    error_msg = state.error_msg
 
     if error_msg != "":
         return Result(CRIT, error_msg)
@@ -104,8 +100,3 @@ def _zk_get_orphaned_objects_state(
 ) -> "OrphanedObjectsState":
     zk_data = get_zk_node(ctx, state_zk_path)
     return OrphanedObjectsState.from_json(zk_data)
-
-
-def _error_message_format(error_msg: str) -> str:
-    error_msg = re.sub(ERROR_MESSAGE_PATTERN, r"\1...\2...", error_msg)
-    return error_msg