Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: d2912d87e63a2c926b4e8b7c81830f51fbdbab4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2912d87e63a2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 17 13:57:00 2017 +0100 Reserved 20 Werk IDS Change-Id: I9c1111737082990c7ca48714479463f1ec6eebda --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b1ee089..1a97831 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5528 +5548

6 years, 10 months

5461 FIX Fixed WaitTimeout handling

by Sven Panne

Module: check_mk Branch: master Commit: 089d8c549f865b9cbb0a0aafb9b9dfced720ec53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=089d8c549f865b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 17 11:33:21 2017 +0100 5461 FIX Fixed WaitTimeout handling The WaitTimeout given in a Livestatus query was handled incorrectly: It was applied each time the condition was not true, and not for the whole query. This has been fixed. Change-Id: If64c4dd18310d40452dd8a76c9071404ca7ffd1e --- .werks/5461 | 13 +++++++++++++ livestatus/src/Query.cc | 36 +++++++++++++++--------------------- livestatus/src/Query.h | 1 - livestatus/src/waittriggers.cc | 2 ++ livestatus/src/waittriggers.h | 2 ++ 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.werks/5461 b/.werks/5461 new file mode 100644 index 0000000..2a7ffb0 --- /dev/null +++ b/.werks/5461 @@ -0,0 +1,13 @@ +Title: Fixed WaitTimeout handling +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510914686 +Class: fix + +The WaitTimeout given in a Livestatus query was handled incorrectly: It was +applied each time the condition was not true, and not for the whole query. +This has been fixed. + diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 4759982..c59025a 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -30,6 +30,7 @@ #include <chrono> #include <cmath> #include <cstdlib> +#include <mutex> #include <ostream> #include <ratio> #include <stdexcept> @@ -90,7 +91,7 @@ Query::Query(const std::list<std::string> &lines, Table *table, , _keepalive(false) , _auth_user(nullptr) , _wait_timeout(0) - , _wait_trigger(nullptr) + , _wait_trigger(&trigger_all()) , _wait_object(nullptr) , _separators("\n", ";", ",", "|") , _show_column_headers(true) @@ -694,27 +695,20 @@ const std::vector<std::unique_ptr<Aggregator>> &Query::getAggregatorsFor( } void Query::doWait() { - while ( - !_wait_condition->accepts(_wait_object, _auth_user, timezoneOffset())) { - if (waitForTrigger() == std::cv_status::timeout) { - return; - } - } -} - -std::cv_status Query::waitForTrigger() const { - auto trigger = _wait_trigger == nullptr ? &trigger_all() : _wait_trigger; + auto pred = [this] { + return _wait_condition->accepts(_wait_object, _auth_user, + timezoneOffset()); + }; + std::unique_lock<std::mutex> lock(trigger_mutex()); if (_wait_timeout == std::chrono::milliseconds(0)) { Debug(_logger) << "waiting until condition becomes true"; - trigger_wait(*trigger); - return std::cv_status::no_timeout; - } - Debug(_logger) << "waiting " << _wait_timeout.count() - << "ms or until condition becomes true"; - auto status = trigger_wait_for(*trigger, _wait_timeout); - if (status == std::cv_status::timeout) { - Debug(_logger) << "wait timeout after " << _wait_timeout.count() - << "ms"; + _wait_trigger->wait(lock, pred); + } else { + Debug(_logger) << "waiting " + << std::chrono::duration_cast<std::chrono::milliseconds>( + _wait_timeout) + .count() + << "ms or until condition becomes true"; + _wait_trigger->wait_for(lock, _wait_timeout, pred); } - return status; } diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index f64f8e8..27732fe 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -111,7 +111,6 @@ private: bool doStats() const; void doWait(); - std::cv_status waitForTrigger() const; void parseFilterLine(char *line, FilterStack &filters); void parseStatsLine(char *line); void parseStatsGroupLine(char *line); diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index 915626a..55475d9 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -40,6 +40,8 @@ std::condition_variable cond_command; std::condition_variable cond_program; } // namespace +std::mutex &trigger_mutex() { return wait_mutex; } + std::condition_variable &trigger_all() { return cond_all; } std::condition_variable &trigger_check() { return cond_check; } diff --git a/livestatus/src/waittriggers.h b/livestatus/src/waittriggers.h index 8e4a951..1f37ae2 100644 --- a/livestatus/src/waittriggers.h +++ b/livestatus/src/waittriggers.h @@ -28,8 +28,10 @@ #include "config.h" // IWYU pragma: keep #include <chrono> #include <condition_variable> +#include <mutex> #include <string> +std::mutex &trigger_mutex(); std::condition_variable &trigger_all(); std::condition_variable &trigger_check(); std::condition_variable &trigger_state();

6 years, 10 months

Made triggers a real class, removing tons of global variables.

by Sven Panne

Module: check_mk Branch: master Commit: ec7a47372910fd3f328a57d4dd26999df0607278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec7a47372910fd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 17 11:36:37 2017 +0100 Made triggers a real class, removing tons of global variables. Change-Id: I963c92d06fd7af8435be5001ea8247baf434a770 --- livestatus/src/Makefile.am | 4 +- livestatus/src/MonitoringCore.h | 3 + livestatus/src/Query.cc | 24 ++----- livestatus/src/Query.h | 4 +- livestatus/src/{waittriggers.cc => Triggers.cc} | 88 ++++++++++--------------- livestatus/src/{waittriggers.h => Triggers.h} | 60 ++++++++++++----- livestatus/src/module.cc | 21 +++--- 7 files changed, 101 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec7a473729…

6 years, 10 months

add werk 5262

by Andreas Umbreit

Module: check_mk Branch: master Commit: d7c53cb4ecc49d310979464c40747a873028bd0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7c53cb4ecc49d… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Nov 17 10:34:34 2017 +0100 add werk 5262 Change-Id: Ie48c164144e7cbd5c6c8944c652d640b9b0a220f --- .werks/5262 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/5262 b/.werks/5262 new file mode 100644 index 0000000..686b233 --- /dev/null +++ b/.werks/5262 @@ -0,0 +1,17 @@ +Title: Fix bug in agent bakery (regression #5261, since 1.4.0p17) +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1510910513 +Class: fix + +Werk #5261 introduced a bug that made it impossible to bake new agents for some specific rulesets. +This would result in error messages like the following: + +<pre> +"TypeError: key ('custom', 'win_certificates/lib/local/win_certificates.ps1') is not a string" +</pre> + +After an update, no further action is required.

6 years, 10 months

5460 FIX Waiting without a wait condition immediately returns now

by Sven Panne

Module: check_mk Branch: master Commit: 8d32bc48d2a55f67720ead73e14a3dd15a54923f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d32bc48d2a55f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 17 11:01:06 2017 +0100 5460 FIX Waiting without a wait condition immediately returns now Note: This change only affects users writing their own tools for the Livestatus interface, and only those tools which rely on an edge case. Up to now, Livestatus had a special obscure case: Using a WaitTrigger header in a query without a WaitCondition header resulted in waiting for the trigger exactly once. This is a misfeature, because it is effectively useless and doesn't do what one might expect: Due to spurious wakeups (https://en.wikipedia.org/wiki/Spurious_wakeup), waiting might return earlier basically at any time. To fix this behaviour, the special case has been removed, and a missing WaitCondition always has its expected semantics (always true) now. Note that this is consistent with a missing Filter header, which means "no filtering". Change-Id: I5e680ac54125d07a2dcd17c8d3aae9a89c0f0455 --- .werks/5460 | 23 +++++++++++++++++++++++ livestatus/src/Query.cc | 8 -------- livestatus/src/Query.h | 1 - 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.werks/5460 b/.werks/5460 new file mode 100644 index 0000000..6f9cd0c --- /dev/null +++ b/.werks/5460 @@ -0,0 +1,23 @@ +Title: Waiting without a wait condition immediately returns now +Level: 1 +Component: livestatus +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1510912156 +Class: fix + +Note: This change only affects users writing their own tools for the +Livestatus interface, and only those tools which rely on an edge case. + +Up to now, Livestatus had a special obscure case: Using a WaitTrigger header +in a query without a WaitCondition header resulted in waiting for the +trigger exactly once. This is a misfeature, because it is effectively +useless and doesn't do what one might expect: Due to spurious wakeups +(https://en.wikipedia.org/wiki/Spurious_wakeup), waiting might return +earlier basically at any time. + +To fix this behaviour, the special case has been removed, and a missing +WaitCondition always has its expected semantics (always true) now. Note +that this is consistent with a missing Filter header, which means "no +filtering". diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 1c75c4f..4759982 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -194,7 +194,6 @@ Query::Query(const std::list<std::string> &lines, Table *table, } _filter = std::make_unique<AndingFilter>(std::move(filters)); - _wait_conditions_empty = wait_conditions.empty(); _wait_condition = std::make_unique<AndingFilter>(std::move(wait_conditions)); } @@ -695,13 +694,6 @@ const std::vector<std::unique_ptr<Aggregator>> &Query::getAggregatorsFor( } void Query::doWait() { - // TODO(sp): Funny special case, do we really want/need this? - if (_wait_conditions_empty && _wait_trigger != nullptr) { - waitForTrigger(); - return; - } - - // Starting from here, it's basically a standard condition variable. while ( !_wait_condition->accepts(_wait_object, _auth_user, timezoneOffset())) { if (waitForTrigger() == std::cv_status::timeout) { diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 6d080f1..f64f8e8 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -90,7 +90,6 @@ private: using FilterStack = std::vector<std::unique_ptr<Filter>>; std::unique_ptr<AndingFilter> _filter; contact *_auth_user; - bool _wait_conditions_empty; // TODO(sp): HACK, remove me... std::unique_ptr<AndingFilter> _wait_condition; std::chrono::milliseconds _wait_timeout; std::condition_variable *_wait_trigger;

6 years, 10 months

Improved typing of wait triggers, simplifying things quite a bit.

by Sven Panne

Module: check_mk Branch: master Commit: f29eed5787f3f4e4cc51fc2ac8e7cf9636dd01a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f29eed5787f3f4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 17 09:01:35 2017 +0100 Improved typing of wait triggers, simplifying things quite a bit. Change-Id: Ia3906ad8a5b36fb1c7a254469e95fc799e56ff77 --- livestatus/src/Query.cc | 14 +++------ livestatus/src/Query.h | 2 +- livestatus/src/waittriggers.cc | 65 +++++++++++++----------------------------- livestatus/src/waittriggers.h | 29 ++++++++----------- 4 files changed, 37 insertions(+), 73 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index b711dd9..1c75c4f 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -497,13 +497,7 @@ void Query::parseWaitTimeoutLine(char *line) { } void Query::parseWaitTriggerLine(char *line) { - auto value = nextStringArgument(&line); - struct trigger *t = trigger_find(value); - if (t == nullptr) { - throw std::runtime_error("invalid trigger '" + value + - "', allowed: " + trigger_all_names()); - } - _wait_trigger = t; + _wait_trigger = &trigger_find(nextStringArgument(&line)); } void Query::parseWaitObjectLine(char *line) { @@ -717,15 +711,15 @@ void Query::doWait() { } std::cv_status Query::waitForTrigger() const { - auto trigger = _wait_trigger == nullptr ? trigger_all() : _wait_trigger; + auto trigger = _wait_trigger == nullptr ? &trigger_all() : _wait_trigger; if (_wait_timeout == std::chrono::milliseconds(0)) { Debug(_logger) << "waiting until condition becomes true"; - trigger_wait(trigger); + trigger_wait(*trigger); return std::cv_status::no_timeout; } Debug(_logger) << "waiting " << _wait_timeout.count() << "ms or until condition becomes true"; - auto status = trigger_wait_for(trigger, _wait_timeout); + auto status = trigger_wait_for(*trigger, _wait_timeout); if (status == std::cv_status::timeout) { Debug(_logger) << "wait timeout after " << _wait_timeout.count() << "ms"; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index e227b17..6d080f1 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -93,7 +93,7 @@ private: bool _wait_conditions_empty; // TODO(sp): HACK, remove me... std::unique_ptr<AndingFilter> _wait_condition; std::chrono::milliseconds _wait_timeout; - struct trigger *_wait_trigger; + std::condition_variable *_wait_trigger; Row _wait_object; CSVSeparators _separators; bool _show_column_headers; diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index a294d9f..915626a 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -25,16 +25,9 @@ #include "waittriggers.h" #include <mutex> #include <ratio> +#include <stdexcept> namespace { -struct trigger *to_trigger(std::condition_variable *c) { - return reinterpret_cast<struct trigger *>(c); -} - -std::condition_variable *from_trigger(struct trigger *c) { - return reinterpret_cast<std::condition_variable *>(c); -} - std::mutex wait_mutex; std::condition_variable cond_all; @@ -47,39 +40,23 @@ std::condition_variable cond_command; std::condition_variable cond_program; } // namespace -struct trigger *trigger_all() { - return to_trigger(&cond_all); -} +std::condition_variable &trigger_all() { return cond_all; } -struct trigger *trigger_check() { - return to_trigger(&cond_check); -} +std::condition_variable &trigger_check() { return cond_check; } -struct trigger *trigger_state() { - return to_trigger(&cond_state); -} +std::condition_variable &trigger_state() { return cond_state; } -struct trigger *trigger_log() { - return to_trigger(&cond_log); -} +std::condition_variable &trigger_log() { return cond_log; } -struct trigger *trigger_downtime() { - return to_trigger(&cond_downtime); -} +std::condition_variable &trigger_downtime() { return cond_downtime; } -struct trigger *trigger_comment() { - return to_trigger(&cond_comment); -} +std::condition_variable &trigger_comment() { return cond_comment; } -struct trigger *trigger_command() { - return to_trigger(&cond_command); -} +std::condition_variable &trigger_command() { return cond_command; } -struct trigger *trigger_program() { - return to_trigger(&cond_program); -} +std::condition_variable &trigger_program() { return cond_program; } -struct trigger *trigger_find(const std::string &name) { +std::condition_variable &trigger_find(const std::string &name) { if (name == "all") { return trigger_all(); } @@ -104,25 +81,23 @@ struct trigger *trigger_find(const std::string &name) { if (name == "program") { return trigger_program(); } - return nullptr; -} - -const char *trigger_all_names() { - return "all, check, state, log, downtime, comment, command and program"; + throw std::runtime_error( + "invalid trigger '" + name + + "', allowed: all, check, state, log, downtime, comment, command and program"); } -void trigger_notify_all(struct trigger *which) { - from_trigger(trigger_all())->notify_all(); - from_trigger(which)->notify_all(); +void trigger_notify_all(std::condition_variable &cond) { + trigger_all().notify_all(); + cond.notify_all(); } -void trigger_wait(struct trigger *which) { +void trigger_wait(std::condition_variable &cond) { std::unique_lock<std::mutex> ul(wait_mutex); - from_trigger(which)->wait(ul); + cond.wait(ul); } -std::cv_status trigger_wait_for(struct trigger *which, +std::cv_status trigger_wait_for(std::condition_variable &cond, std::chrono::milliseconds ms) { std::unique_lock<std::mutex> ul(wait_mutex); - return from_trigger(which)->wait_for(ul, ms); + return cond.wait_for(ul, ms); } diff --git a/livestatus/src/waittriggers.h b/livestatus/src/waittriggers.h index 0f78a73..8e4a951 100644 --- a/livestatus/src/waittriggers.h +++ b/livestatus/src/waittriggers.h @@ -30,26 +30,21 @@ #include <condition_variable> #include <string> -// This is basically a C++ class for triggers done the "C way" via an opaque -// struct, explicit passing of 'this' and using a prefix for names. -struct trigger; +std::condition_variable &trigger_all(); +std::condition_variable &trigger_check(); +std::condition_variable &trigger_state(); +std::condition_variable &trigger_log(); +std::condition_variable &trigger_downtime(); +std::condition_variable &trigger_comment(); +std::condition_variable &trigger_command(); +std::condition_variable &trigger_program(); -trigger *trigger_all(); -trigger *trigger_check(); -trigger *trigger_state(); -trigger *trigger_log(); -trigger *trigger_downtime(); -trigger *trigger_comment(); -trigger *trigger_command(); -trigger *trigger_program(); +std::condition_variable &trigger_find(const std::string &name); -trigger *trigger_find(const std::string &name); -const char *trigger_all_names(); +void trigger_notify_all(std::condition_variable &cond); -void trigger_notify_all(struct trigger *which); - -void trigger_wait(struct trigger *which); -std::cv_status trigger_wait_for(struct trigger *which, +void trigger_wait(std::condition_variable &cond); +std::cv_status trigger_wait_for(std::condition_variable &cond, std::chrono::milliseconds ms); #endif // waittriggers_h

6 years, 10 months

Reserved 20 Werk IDS

by Andreas Umbreit

Module: check_mk Branch: master Commit: 5a79f44d03b0b84bc465c666462088f08b2615c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a79f44d03b0b8… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Nov 17 10:20:33 2017 +0100 Reserved 20 Werk IDS Change-Id: Ibecc656fb8e189dea79dbd5b15803f881533081d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7d47b0b..6f7f098 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5498 +5518

6 years, 10 months

5244 FIX Activate Changes: Fixed "Has never been activated" status message

by Andreas Boesl

Module: check_mk Branch: master Commit: 50952fa97f1febbf55e71743f873a47dce52d474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50952fa97f1feb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 15 16:39:58 2017 +0100 5244 FIX Activate Changes: Fixed "Has never been activated" status message This message was shown, because some state files were only stored temporarily. Change-Id: Ia00440bddeebdaa72182e3ef9d7371718456ad48 --- .werks/5244 | 10 +++++++++ web/htdocs/watolib.py | 60 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.werks/5244 b/.werks/5244 new file mode 100644 index 0000000..b2f25ca --- /dev/null +++ b/.werks/5244 @@ -0,0 +1,10 @@ +Title: Activate Changes: Fixed "Has never been activated" status message +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510760308 +Class: fix + +This message was shown, because some state files were only stored temporarily. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 98125fe..a677499 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4612,16 +4612,11 @@ class ActivateChanges(object): return any([ c["need_restart"] for c in self._changes_of_site(site_id) ]) + # This function returns the last known persisted activation state def _last_activation_state(self, site_id): - last_activation_id = self._repstatus.get(site_id, {}).get("last_activation") manager = ActivateChangesManager() - manager.load() - try: - manager.load_activation(last_activation_id) - except MKUserError: - return {} - - return manager.get_site_state(site_id) + site_state_path = os.path.join(manager.activation_persisted_dir, manager.site_filename(site_id)) + return store.load_data_from_file(site_state_path, {}) def _get_last_change_id(self): @@ -4725,7 +4720,10 @@ class ActivateChangesWriter(ActivateChanges): class ActivateChangesManager(ActivateChanges): - activation_base_dir = cmk.paths.tmp_dir + "/wato/activation" + # Temporary data + activation_tmp_base_dir = cmk.paths.tmp_dir + "/wato/activation" + # Persisted data + activation_persisted_dir = cmk.paths.var_dir + "/wato/activation" def __init__(self): self._sites = [] @@ -4734,6 +4732,8 @@ class ActivateChangesManager(ActivateChanges): self._activate_foreign = False self._activation_id = None self._snapshot_id = None + if not os.path.exists(self.activation_persisted_dir): + os.makedirs(self.activation_persisted_dir) super(ActivateChangesManager, self).__init__() @@ -4846,11 +4846,11 @@ class ActivateChangesManager(ActivateChanges): def _info_path(self): - return "%s/%s/info.mk" % (self.activation_base_dir, self._activation_id) + return "%s/%s/info.mk" % (self.activation_tmp_base_dir, self._activation_id) def _site_snapshot_file(self, site_id): - return "%s/%s/site_%s_sync.tar.gz" % (self.activation_base_dir, self._activation_id, site_id) + return "%s/%s/site_%s_sync.tar.gz" % (self.activation_tmp_base_dir, self._activation_id, site_id) def _load_activation(self): @@ -4910,7 +4910,7 @@ class ActivateChangesManager(ActivateChanges): # This single function is responsible for the slow activate changes (python tar packaging..) create_snapshot(self._comment) - work_dir = os.path.join(self.activation_base_dir, self._activation_id) + work_dir = os.path.join(self.activation_tmp_base_dir, self._activation_id) if cmk.is_managed_edition(): import managed_snapshots managed_snapshots.CMESnapshotManager(work_dir, self._get_site_configurations()).generate_snapshots() @@ -4980,7 +4980,7 @@ class ActivateChangesManager(ActivateChanges): def _get_site_tmp_dir(self, site_id): - return os.path.join(self.activation_base_dir, self._activation_id, "sync-%s-specific-%.4f" % (site_id, time.time())) + return os.path.join(self.activation_tmp_base_dir, self._activation_id, "sync-%s-specific-%.4f" % (site_id, time.time())) def _check_snapshot_creation_permissions(self, site_id): @@ -5093,12 +5093,16 @@ class ActivateChangesManager(ActivateChanges): def _load_site_state(self, site_id): - return store.load_data_from_file(self._site_state_path(site_id), {}) + return store.load_data_from_file(self.site_state_path(site_id), {}) + + def site_state_path(self, site_id): + return os.path.join(self.activation_tmp_base_dir, self._activation_id, self.site_filename(site_id)) - def _site_state_path(self, site_id): - return "%s/%s/site_%s.mk" % \ - (self.activation_base_dir, self._activation_id, site_id) + + @classmethod + def site_filename(cls, site_id): + return "site_%s.mk" % site_id # Cleanup stale activations? @@ -5126,7 +5130,7 @@ class ActivateChangesManager(ActivateChanges): finally: if delete: shutil.rmtree("%s/%s" % - (ActivateChangesManager.activation_base_dir, activation_id)) + (ActivateChangesManager.activation_tmp_base_dir, activation_id)) finally: unlock_exclusive() @@ -5134,7 +5138,7 @@ class ActivateChangesManager(ActivateChanges): def _existing_activation_ids(self): ids = [] - for activation_id in os.listdir(ActivateChangesManager.activation_base_dir): + for activation_id in os.listdir(ActivateChangesManager.activation_tmp_base_dir): if len(activation_id) == 36 and activation_id[8] == "-" and activation_id[13] == "-": ids.append(activation_id) @@ -5266,6 +5270,13 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): finally: self._unlock_activation() + # Create a copy of last result in the persisted dir + manager = ActivateChangesManager() + manager.load() + manager.load_activation(self._activation_id) + source_path = manager.site_state_path(self._site_id) + shutil.copy(source_path, manager.activation_persisted_dir) + def _activate_until_change_id(self): manager = ActivateChangesManager() @@ -5534,7 +5545,11 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def _save_state(self): - return store.save_data_to_file(self._state_path(), { + state_path = os.path.join(ActivateChangesManager.activation_tmp_base_dir, + self._activation_id, + ActivateChangesManager.site_filename(self._site_id)) + + return store.save_data_to_file(state_path, { "_site_id" : self._site_id, "_phase" : self._phase, "_state" : self._state, @@ -5549,11 +5564,6 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): }) - def _state_path(self): - return "%s/%s/site_%s.mk" % \ - (ActivateChangesManager.activation_base_dir, self._activation_id, self._site_id) - - def _load_expected_duration(self): times = self.get_activation_times(self._site_id) duration = 0.0

6 years, 10 months

5478 FIX fileinfo: fix globbing pattern expansion

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3da5d48c5bb34f833b4f7c05056bb85e5eb79872 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3da5d48c5bb34f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Nov 16 14:16:12 2017 +0100 5478 FIX fileinfo: fix globbing pattern expansion Fixes the issue that globbing patterns were not expanded after the introduction of werk 5344. Change-Id: Ia8cee28137aefc9e8aff5b8db6f28e1c24ea3ab2 --- .werks/5478 | 12 ++++++++++++ agents/check_mk_agent.aix | 4 ++-- agents/check_mk_agent.freebsd | 4 ++-- agents/check_mk_agent.linux | 4 ++-- agents/check_mk_agent.macosx | 4 ++-- agents/check_mk_agent.openwrt | 4 ++-- agents/check_mk_agent.solaris | 4 ++-- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.werks/5478 b/.werks/5478 new file mode 100644 index 0000000..ada7403 --- /dev/null +++ b/.werks/5478 @@ -0,0 +1,12 @@ +Title: fileinfo: fix globbing pattern expansion +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510837983 + +Fixes the issue that globbing patterns were not expanded +after the introduction of werk 5344. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7632cb5..9376857 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -291,12 +291,12 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then date +%s # simulate output of the Linux "stat -c "%n|%s|%Y" command # TODO: feel free to improve this command. It opens the perl interpreter for every file found... - while read pattern + for pattern in $(cat "$MK_CONFDIR/fileinfo.cfg" 2>/dev/null) do if [ -f "$pattern" ]; then ls -1 "$pattern" fi - done < "$MK_CONFDIR/fileinfo.cfg" 2>/dev/null |\ + done |\ while read file do /usr/bin/perl -e 'printf "$_|%s|%s\n", (stat) [7,9] for @ARGV' "$file" diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 3748661..ba9aaf4 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -380,14 +380,14 @@ fi if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - while read line + for line in $(cat "$MK_CONFDIR/fileinfo.cfg") do stat -f "%N|%z|%m" "$line" 2>/dev/null if [ $? -ne 0 ]; then echo "$line|missing|$(date +%s)" fi - done < "$MK_CONFDIR/fileinfo.cfg" + done fi diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f060f68..18244fb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -766,7 +766,7 @@ function replace_datevariable() if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - while read line + for line in $(cat "$MK_CONFDIR/fileinfo.cfg") do # only work on lines containing files, skip e.g. comments and blank lines if [ "${line:0:1}" = "/" ]; then @@ -777,7 +777,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo "$line|missing|$(date +%s)" fi fi - done < "$MK_CONFDIR/fileinfo.cfg" + done fi # Get stats about OMD monitoring cores running on this machine. diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 73b65ee..cb15c7e 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -93,14 +93,14 @@ netstat -ntfinet | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - while read line + for line in $(cat "$MK_CONFDIR/fileinfo.cfg") do stat -f "%N|%z|%m" "$line" 2>/dev/null if [ $? -ne 0 ]; then echo "$line|missing|$(date +%s)" fi - done < "$MK_CONFDIR/fileinfo.cfg" + done fi if type tmutil >/dev/null diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index c7e3125..37b9ff5 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -681,14 +681,14 @@ fi if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - while read line + for line in $(cat "$MK_CONFDIR/fileinfo.cfg") do stat -c "%n|%s|%Y" "$line" 2>/dev/null if [ $? -ne 0 ]; then echo "$line|missing|$(date +%s)" fi - done < "$MK_CONFDIR/fileinfo.cfg" + done fi # Get stats about OMD monitoring cores running on this machine. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 95b4dac..68c4310 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -369,7 +369,7 @@ then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' # note: patterns in the fileinfo.cfg are resolved inside this loop - while read file + for file in $(cat "$MK_CONFDIR/fileinfo.cfg") do # only work on lines containing files, skip e.g. comments and blank lines if [ "${file:0:1}" = "/" ]; then @@ -387,7 +387,7 @@ then echo "$file|missing|$(/usr/bin/perl -e 'print time')" fi fi - done < "$MK_CONFDIR/fileinfo.cfg" + done fi # Libelle Business Shadow

6 years, 10 months

Reserved 20 Werk IDS

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 308b6498001fdaaf6c6873e2320e5ee10953ad1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=308b6498001fda… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Nov 16 13:39:13 2017 +0100 Reserved 20 Werk IDS Change-Id: I07a9f01aeda025a4543b8d52f45f68f45c679908 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7bcda5b..7d47b0b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5478 +5498

6 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017