Module: check_mk
Branch: master
Commit: fc6c00fa3137b225eb3097d1771e1cecea238acf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc6c00fa3137b2…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Dec 21 11:06:11 2016 +0100
4008 FIX Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows
agent
The windows agent could freeze in the dotnet_clrmemory section while querying WMI
counters.
This freeze is presumably caused by an earlier WMI query for the skype section which
failed, due to a non-existing wmi counter.
Change-Id: I4fc4d08a0e2deec60766da2d3d49eac157628622
---
.werks/4008 | 10 ++++++++++
ChangeLog | 1 +
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1327104 -> 1327104 bytes
agents/windows/check_mk_agent-64.unstripped.exe | Bin 15506632 -> 15506632 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1327104 -> 1327104 bytes
agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes
agents/windows/check_mk_agent.msi | Bin 2899456 -> 2899456 bytes
agents/windows/check_mk_agent.unstripped.exe | Bin 13407014 -> 13407014 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1302528 bytes
agents/windows/install_agent-64.exe | Bin 585703 -> 585704 bytes
agents/windows/install_agent.exe | Bin 582532 -> 582536 bytes
agents/windows/wmiHelper.cc | 2 +-
13 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.werks/4008 b/.werks/4008
new file mode 100644
index 0000000..531b894
--- /dev/null
+++ b/.werks/4008
@@ -0,0 +1,10 @@
+Title: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows
agent
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i4
+Date: 1482314283
+Class: fix
+
+The windows agent could freeze in the dotnet_clrmemory section while querying WMI
counters.
+This freeze is presumably caused by an earlier WMI query for the skype section which
failed, due to a non-existing wmi counter.
diff --git a/ChangeLog b/ChangeLog
index 7130923..a2d9676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
* 4174 FIX: added missing perfometer for interface services
* 4119 FIX: check_mk_agent.solaris: fixed run_cached function...
* 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista
api setting
+ * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of
windows agent...
Multisite:
* 4169 View action: Default values of sticky, notification and persistent options can
now be configured via global settings....
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 76c0db3..cc50439 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2196
+2199
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index a3c6a22..99ba5e8 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unstripped.exe
b/agents/windows/check_mk_agent-64.unstripped.exe
index af25adc..e050b8e 100755
Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and
b/agents/windows/check_mk_agent-64.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 6319119..e5604f8 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index aefa0e4..8f805ab 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index f573f80..eaf74da 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unstripped.exe
b/agents/windows/check_mk_agent.unstripped.exe
index 78d6e4c..c289fb1 100755
Binary files a/agents/windows/check_mk_agent.unstripped.exe and
b/agents/windows/check_mk_agent.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 0e9744c..7061d64 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 61adf30..2eb908c 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 84f75ea..5e37241 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc
index 1fc6219..edc7e8a 100644
--- a/agents/windows/wmiHelper.cc
+++ b/agents/windows/wmiHelper.cc
@@ -188,7 +188,7 @@ bool Result::next() {
IWbemClassObject *obj;
ULONG numReturned;
// always retrieve only one element
- HRESULT res = _enumerator->Next(WBEM_INFINITE, 1, &obj, &numReturned);
+ HRESULT res = _enumerator->Next(10000, 1, &obj, &numReturned);
if (FAILED(res)) {
// in this case the "current" object isn't changed to guarantee
that the