Changes committed to git://git.pcp.io/pcp.git master
Nathan Scott (4):
pmlogger scripts: really use default pmcd timeouts by default
misc: add --version/-V option to several more commands
pmlogextract: fix metadata checking for duplicate names
qa: update test 1010 output to match fixed dumptext typo
Mark Goodwin (1):
libpcp: short-circuit logic in shared-context port number check
Marko Myllynen (1):
docs: fix pcp iostat man page typo
qa/075.out | 2 ++
qa/1010.out | 4 ++--
qa/569.out | 2 ++
qa/916 | 40 ++++++++++++++++++++++++++++++++++++++++
qa/916.out | 4 ++++
qa/archives/dupname-a.0 |binary
qa/archives/dupname-a.index |binary
qa/archives/dupname-a.meta |binary
qa/archives/dupname-b.0 |binary
qa/archives/dupname-b.index |binary
qa/archives/dupname-b.meta |binary
qa/archives/dupname-c.0 |binary
qa/archives/dupname-c.index |binary
qa/archives/dupname-c.meta |binary
qa/group | 1 +
src/libpcp/src/context.c | 7 +++++--
src/pcp/iostat/pcp-iostat.1 | 2 +-
src/pmcd_wait/pmcd_wait.c | 16 ++++++++--------
src/pmchart/main.cpp | 15 ++++++++++-----
src/pmdumplog/pmdumplog.c | 5 ++++-
src/pmdumptext/pmdumptext.cpp | 7 ++++---
src/pmlogconf/pmlogconf.sh | 21 +++++++++++++++++++--
src/pmlogextract/pmlogextract.c | 9 +++++++--
src/pmlogger/control | 4 ++--
src/pmlogsummary/pmdiff.sh | 6 ++++++
src/pmlogsummary/pmlogsummary.c | 13 ++++++++-----
src/pmprobe/pmprobe.c | 24 ++++++++++++++++++++----
src/pmstore/pmstore.c | 12 ++++++++----
28 files changed, 153 insertions(+), 41 deletions(-)
commit 1eb31a3f15ad288cd8a035580bed001b83a04938
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue May 3 16:15:38 2016 +1000
qa: update test 1010 output to match fixed dumptext typo
commit 8c7ac99acca5221d060f04918fd7f6ba8e2ccf97
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue May 3 16:14:46 2016 +1000
pmlogextract: fix metadata checking for duplicate names
Zack Cerza reported a situation merging several archives that
resulted in no merged archives and this error message:
pmlogextract: Error: metric PMID 60.18.0: name changed from hinv.cpu.clock,
hinv.cpu.clock to hinv.cpu.clock!
The pmlogextract logic to verify name consistency appears to
be too strict in this particular case. The pmlogger quirk of
sometimes producing archives with dup names recorded for one
PMID (which pmlogextract otherwise handles) results in a case
where one archive may have dup names, and another none, but
this is still consistent metadata which can be merged. Extend
the matchnames() routine to correctly identify this case as an
exact match.
Test case 916 is added to show the issue and verify the fix.
commit c0c7c68e1c086ab1c3eda3c19e67a63371d21a02
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue May 3 13:46:39 2016 +1000
misc: add --version/-V option to several more commands
Covers pmdiff, pmlogsummary, pmprobe, pmstore, pmdumptext, pmchart.
(pmprobe was already using -V unfortunately but --version is fine).
Resolves Fedora BZ #1331489.
commit 35f5ca1f80ef72b03afd77418e108fd0c9953e11
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue May 3 11:43:19 2016 +1000
pmlogger scripts: really use default pmcd timeouts by default
Somehow, at some point in the distant past, the "far-away" pmcd
timeouts became enabled by default in the pmlogger control file.
Make these match the pmie control file, which uses the correct
defaults and has a helpful comment about non-default values.
Add a one-trip guard to pmlogconf so that it will fail-fast in
the mode where a remote pmcd takes ages to respond (otherwise,
it will iteratively call pmprobe, and each separate invocation
is subject to the pmcd connection timeout).
While investigating, found pmcd_wait could mis-report timeouts
in its verbose/diagnostic mode, so cleaned that up here too.
commit a6cfa75bed4597d2f53e1af571a71c6004ad559a
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Tue May 3 11:35:19 2016 +1000
libpcp: short-circuit logic in shared-context port number check
commit efb0c1efd75e744f1e6778ebcfe22c3f2f145efe
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Tue May 3 09:39:54 2016 +1000
docs: fix pcp iostat man page typo
|