Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package collectl for openSUSE:Factory
checked in at 2022-12-15 19:25:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/collectl (Old)
and /work/SRC/openSUSE:Factory/.collectl.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectl"
Thu Dec 15 19:25:59 2022 rev:37 rq:1043124 version:4.3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2022-05-12
23:01:13.632866635 +0200
+++ /work/SRC/openSUSE:Factory/.collectl.new.1835/collectl.changes
2022-12-15 19:26:23.336460403 +0100
@@ -1,0 +2,10 @@
+Mon Dec 5 12:58:41 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to 4.3.6:
+ - Removed the error check in sub vmstatInit
+ It was erroneous and that option is seldom used.
+ Reported-by Bill Torpey
+ - Add default collection for Cepg rbd devices to the conf file
+ - Add patch for dskopts=F to allow double digit precision on playback
+
+-------------------------------------------------------------------
Old:
----
collectl-4.3.3.src.tar.gz
New:
----
collectl-4.3.6.src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ collectl.spec ++++++
--- /var/tmp/diff_new_pack.YyNlMs/_old 2022-12-15 19:26:23.764462838 +0100
+++ /var/tmp/diff_new_pack.YyNlMs/_new 2022-12-15 19:26:23.768462861 +0100
@@ -16,13 +16,16 @@
#
+%if ! %{defined _fillupdir}
+%define _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
Name: collectl
-Version: 4.3.3
+Version: 4.3.6
Release: 0
Summary: System status data collection utility
License: Artistic-1.0 AND GPL-2.0-or-later
Group: System/Monitoring
-URL: http://collectl.sourceforge.net
+URL: https://collectl.sourceforge.net
Source0:
http://sourceforge.net/projects/collectl/files/collectl/%{name}-%{version}/%{name}-%{version}.src.tar.gz
Source1: collectl.service
Source2: collectl.sysconfig
@@ -32,10 +35,6 @@
BuildArch: noarch
%{?systemd_requires}
-%if ! %{defined _fillupdir}
-%define _fillupdir /var/adm/fillup-templates
-%endif
-
%description
Similar to the "sar" program, collectl does collection of device performance
information. It features:
@@ -100,8 +99,8 @@
%{_sbindir}/collectl
%{_sbindir}/rccollectl
%{_datadir}/collectl
-%{_mandir}/man1/collectl.1.gz
-%{_mandir}/man1/colmux.1.gz
+%{_mandir}/man1/collectl.1%{?ext_man}
+%{_mandir}/man1/colmux.1%{?ext_man}
%dir %{_var}/log/%{name}
%changelog
++++++ collectl-4.3.3.src.tar.gz -> collectl-4.3.6.src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/COMMIT_EDITMSG
new/collectl/.git/COMMIT_EDITMSG
--- old/collectl/.git/COMMIT_EDITMSG 2022-04-01 17:53:32.000000000 +0200
+++ new/collectl/.git/COMMIT_EDITMSG 2022-11-30 00:30:00.000000000 +0100
@@ -1,16 +1,11 @@
-Patch to fix IB collection in systems with multiple mellanox cards
-suggested-by: Gary Skouson
-
-The use of HCAName isn't right and should be HCAId, especially if you have
mellanox ethernet and IB in the same box, the '0' or $i isn't going to work
right. For example on one system, we have bonded ethernet on a mellanox
ethernet card and a separate IB card, so /sys/class/infiniband shows two
devices mlx5_2 and mlx5_bond_0.
-
-For the formatit.ph the logic isn't right. The $link comparison should be with
"eq" not "=". I also think we need to chomp $link to remove the newline before
the compare.
-
+Version 4.3.6 with fix in sub vmstatInit where error check was removed
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
+#
# On branch master
-# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
+# Your branch is up to date with 'origin/master'.
#
+# Changes to be committed:
+# modified: RELEASE-collectl
# modified: collectl
-# modified: formatit.ph
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/applypatch-msg.sample
new/collectl/.git/hooks/applypatch-msg.sample
--- old/collectl/.git/hooks/applypatch-msg.sample 2022-01-10
22:56:14.000000000 +0100
+++ new/collectl/.git/hooks/applypatch-msg.sample 2022-09-29
15:40:13.000000000 +0200
@@ -10,6 +10,6 @@
# To enable this hook, rename this file to "applypatch-msg".
. git-sh-setup
-test -x "$GIT_DIR/hooks/commit-msg" &&
- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/fsmonitor-watchman.sample
new/collectl/.git/hooks/fsmonitor-watchman.sample
--- old/collectl/.git/hooks/fsmonitor-watchman.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/fsmonitor-watchman.sample 2022-09-29
15:40:13.000000000 +0200
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+ die "Unsupported query-fsmonitor hook version '$version'.\n" .
+ "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+} or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+ my $o = watchman_query();
+ if (is_work_tree_watched($o)) {
+ output_result($o->{clock}, @{$o->{files}});
+ }
+}
+
+sub output_result {
+ my ($clockid, @files) = @_;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # binmode $fh, ":utf8";
+ # print $fh "$clockid\n@files\n";
+ # close $fh;
+
+ binmode STDOUT, ":utf8";
+ print $clockid;
+ print "\0";
+ local $, = "\0";
+ print @files;
+}
+
+sub watchman_clock {
+ my $response = qx/watchman clock "$git_work_tree"/;
+ die "Failed to get clock id on '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+ my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+ or die "open2() failed: $!\n" .
+ "Falling back to scanning...\n";
+
+ # In the query expression below we're asking for names of files that
+ # changed since $last_update_token but not from the .git folder.
+ #
+ # To accomplish this, we're using the "since" generator to use the
+ # recency index to select candidate nodes and "fields" to limit the
+ # output to file names only. Then we're using the "expression" term to
+ # further constrain the results.
+ if (substr($last_update_token, 0, 1) eq "c") {
+ $last_update_token = "\"$last_update_token\"";
+ }
+ my $query = <<" END";
+ ["query", "$git_work_tree", {
+ "since": $last_update_token,
+ "fields": ["name"],
+ "expression": ["not", ["dirname", ".git"]]
+ }]
+ END
+
+ # Uncomment for debugging the watchman query
+ # open (my $fh, ">", ".git/watchman-query.json");
+ # print $fh $query;
+ # close $fh;
+
+ print CHLD_IN $query;
+ close CHLD_IN;
+ my $response = do {local $/; <CHLD_OUT>};
+
+ # Uncomment for debugging the watch response
+ # open ($fh, ">", ".git/watchman-response.json");
+ # print $fh $response;
+ # close $fh;
+
+ die "Watchman: command returned no output.\n" .
+ "Falling back to scanning...\n" if $response eq "";
+ die "Watchman: command returned invalid output: $response\n" .
+ "Falling back to scanning...\n" unless $response =~ /^\{/;
+
+ return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+ my ($output) = @_;
+ my $error = $output->{error};
+ if ($retry > 0 and $error and $error =~ m/unable to resolve root .*
directory (.*) is not watched/) {
+ $retry--;
+ my $response = qx/watchman watch "$git_work_tree"/;
+ die "Failed to make watchman watch '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+ $output = $json_pkg->new->utf8->decode($response);
+ $error = $output->{error};
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # close $fh;
+
+ # Watchman will always return all files on the first query so
+ # return the fast "everything is dirty" flag to git and do the
+ # Watchman query just to get it over with now so we won't pay
+ # the cost in git to look up each individual file.
+ my $o = watchman_clock();
+ $error = $output->{error};
+
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ output_result($o->{clock}, ("/"));
+ $last_update_token = $o->{clock};
+
+ eval { launch_watchman() };
+ return 0;
+ }
+
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ return 1;
+}
+
+sub get_working_dir {
+ my $working_dir;
+ if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $working_dir = Win32::GetCwd();
+ $working_dir =~ tr/\\/\//;
+ } else {
+ require Cwd;
+ $working_dir = Cwd::cwd();
+ }
+
+ return $working_dir;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-applypatch.sample
new/collectl/.git/hooks/pre-applypatch.sample
--- old/collectl/.git/hooks/pre-applypatch.sample 2022-01-10
22:56:14.000000000 +0100
+++ new/collectl/.git/hooks/pre-applypatch.sample 2022-09-29
15:40:13.000000000 +0200
@@ -9,6 +9,6 @@
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-commit.sample
new/collectl/.git/hooks/pre-commit.sample
--- old/collectl/.git/hooks/pre-commit.sample 2022-01-10 22:56:14.000000000
+0100
+++ new/collectl/.git/hooks/pre-commit.sample 2022-09-29 15:40:13.000000000
+0200
@@ -12,16 +12,16 @@
against=HEAD
else
# Initial commit: diff against an empty tree object
- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ against=$(git hash-object -t tree /dev/null)
fi
-# If you want to allow non-ascii filenames set this variable to true.
-allownonascii=$(git config hooks.allownonascii)
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
-# Cross platform projects tend to avoid non-ascii filenames; prevent
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
@@ -31,18 +31,17 @@
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
- echo "Error: Attempt to add a non-ascii file name."
- echo
- echo "This can cause problems if you want to work"
- echo "with people on other platforms."
- echo
- echo "To be portable it is advisable to rename the file ..."
- echo
- echo "If you know what you are doing you can disable this"
- echo "check using:"
- echo
- echo " git config hooks.allownonascii true"
- echo
+ cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+ git config hooks.allownonascii true
+EOF
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-merge-commit.sample
new/collectl/.git/hooks/pre-merge-commit.sample
--- old/collectl/.git/hooks/pre-merge-commit.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/pre-merge-commit.sample 2022-09-29
15:40:13.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit"
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-push.sample
new/collectl/.git/hooks/pre-push.sample
--- old/collectl/.git/hooks/pre-push.sample 2022-01-10 22:56:14.000000000
+0100
+++ new/collectl/.git/hooks/pre-push.sample 2022-09-29 15:40:13.000000000
+0200
@@ -14,7 +14,7 @@
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
-# <local ref> <local sha1> <remote ref> <remote sha1>
+# <local ref> <local oid> <remote ref> <remote oid>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
@@ -22,29 +22,29 @@
remote="$1"
url="$2"
-z40=0000000000000000000000000000000000000000
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
-IFS=' '
-while read local_ref local_sha remote_ref remote_sha
+while read local_ref local_oid remote_ref remote_oid
do
- if [ "$local_sha" = $z40 ]
+ if test "$local_oid" = "$zero"
then
# Handle delete
+ :
else
- if [ "$remote_sha" = $z40 ]
+ if test "$remote_oid" = "$zero"
then
# New branch, examine all commits
- range="$local_sha"
+ range="$local_oid"
else
# Update to existing branch, examine new commits
- range="$remote_sha..$local_sha"
+ range="$remote_oid..$local_oid"
fi
# Check for WIP commit
- commit=`git rev-list -n 1 --grep '^WIP' "$range"`
- if [ -n "$commit" ]
+ commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+ if test -n "$commit"
then
- echo "Found WIP commit in $local_ref, not pushing"
+ echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-rebase.sample
new/collectl/.git/hooks/pre-rebase.sample
--- old/collectl/.git/hooks/pre-rebase.sample 2022-01-10 22:56:14.000000000
+0100
+++ new/collectl/.git/hooks/pre-rebase.sample 2022-09-29 15:40:13.000000000
+0200
@@ -58,7 +58,7 @@
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
- echo >&2 "$topic is already up-to-date with master"
+ echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
@@ -88,9 +88,7 @@
exit 1
fi
-exit 0
-
-################################################################
+<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
@@ -167,3 +165,5 @@
git rev-list master..topic
if this is empty, it is fully merged to "master".
+
+DOC_END
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/pre-receive.sample
new/collectl/.git/hooks/pre-receive.sample
--- old/collectl/.git/hooks/pre-receive.sample 1970-01-01 01:00:00.000000000
+0100
+++ new/collectl/.git/hooks/pre-receive.sample 2022-09-29 15:40:13.000000000
+0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+ i=0
+ while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+ do
+ eval "value=\$GIT_PUSH_OPTION_$i"
+ case "$value" in
+ echoback=*)
+ echo "echo from the pre-receive-hook: ${value#*=}" >&2
+ ;;
+ reject)
+ exit 1
+ esac
+ i=$((i + 1))
+ done
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/prepare-commit-msg.sample
new/collectl/.git/hooks/prepare-commit-msg.sample
--- old/collectl/.git/hooks/prepare-commit-msg.sample 2022-01-10
22:56:14.000000000 +0100
+++ new/collectl/.git/hooks/prepare-commit-msg.sample 2022-09-29
15:40:13.000000000 +0200
@@ -9,8 +9,8 @@
#
# To enable this hook, rename this file to "prepare-commit-msg".
-# This hook includes three examples. The first comments out the
-# "Conflicts:" part of a merge commit.
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
@@ -20,17 +20,23 @@
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
-case "$2,$3" in
- merge,)
- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/;
print' "$1" ;;
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
-# ,|template,)
-# /usr/bin/perl -i.bak -pe '
-# print "\n" . `git diff --cached --name-status -r`
-# if /^#/ && $first++ == 0' "$1" ;;
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit
message/..m/^#$/)' "$COMMIT_MSG_FILE"
- *) ;;
-esac
+# case "$COMMIT_SOURCE,$SHA1" in
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+# *) ;;
+# esac
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by:
\1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/push-to-checkout.sample
new/collectl/.git/hooks/push-to-checkout.sample
--- old/collectl/.git/hooks/push-to-checkout.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/push-to-checkout.sample 2022-09-29
15:40:13.000000000 +0200
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+ echo >&2 "$*"
+ exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+ die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+ die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+ head=HEAD
+else
+ head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+ die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+ die "Could not update working tree to new HEAD"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/hooks/update.sample
new/collectl/.git/hooks/update.sample
--- old/collectl/.git/hooks/update.sample 2022-01-10 22:56:14.000000000
+0100
+++ new/collectl/.git/hooks/update.sample 2022-09-29 15:40:13.000000000
+0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# An example hook script to blocks unannotated tags from entering.
+# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
@@ -43,11 +43,11 @@
fi
# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
@@ -60,7 +60,7 @@
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
Binary files old/collectl/.git/index and new/collectl/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/logs/HEAD new/collectl/.git/logs/HEAD
--- old/collectl/.git/logs/HEAD 2022-04-01 17:53:32.000000000 +0200
+++ new/collectl/.git/logs/HEAD 2022-11-30 00:30:00.000000000 +0100
@@ -1,4 +1,6 @@
-0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
-dc327fab45370c2f04bf174f8003a75b5134e7e8
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851810 -0500 checkout: moving from master to master
-dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006659 -0500 commit: Added specifics about version 4.3.2 and uploaded
new version to Sourceforge
-8c37d5f9a64457b6e75f31d094503e4feb9808f0
517c19c94ae623eb7ab373edff1563328d03eb2b Laurence Oberman <lober...@redhat.com>
1648828322 -0400 commit: Patch to fix IB collection in systems with
multiple mellanox cards
+0000000000000000000000000000000000000000
a34a0f47c1c2f387e2660c496d87ed84b04a87c5 Laurence Oberman <lober...@redhat.com>
1664458815 -0400 clone: from https://github.com/sharkcz/collectl.git
+a34a0f47c1c2f387e2660c496d87ed84b04a87c5
30ff18dc049d163d01599fee35226fa8e57ca5bc Laurence Oberman <lober...@redhat.com>
1666993467 -0400 commit: Added default support for rbd (Rados block) disks
to the default collectl.conf file
+30ff18dc049d163d01599fee35226fa8e57ca5bc
221d0a683f5487b103973f00f8ccc45c80a3dd07 Laurence Oberman <lober...@redhat.com>
1666993698 -0400 commit: Released 4.3.5 with default rbd device support
+221d0a683f5487b103973f00f8ccc45c80a3dd07
928e0a662a67b0c38f0d5ebacae3d28440d3e3f6 Laurence Oberman <lober...@redhat.com>
1667833128 -0500 commit: Added the tar file for colplot to our source tree
+928e0a662a67b0c38f0d5ebacae3d28440d3e3f6
625e2453842121519e9e5a38c283d02e72e2ed89 Laurence Oberman <lober...@redhat.com>
1669763984 -0500 commit: Removed the error check in sub vmstatInit
+625e2453842121519e9e5a38c283d02e72e2ed89
2001864971f91999216daf091529f5aa47d69150 Laurence Oberman <lober...@redhat.com>
1669764566 -0500 commit: Version 4.3.6 with fix in sub vmstatInit where
error check was removed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/logs/refs/heads/master
new/collectl/.git/logs/refs/heads/master
--- old/collectl/.git/logs/refs/heads/master 2022-04-01 17:53:32.000000000
+0200
+++ new/collectl/.git/logs/refs/heads/master 2022-11-30 00:30:00.000000000
+0100
@@ -1,3 +1,6 @@
-0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
-dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006659 -0500 commit: Added specifics about version 4.3.2 and uploaded
new version to Sourceforge
-8c37d5f9a64457b6e75f31d094503e4feb9808f0
517c19c94ae623eb7ab373edff1563328d03eb2b Laurence Oberman <lober...@redhat.com>
1648828322 -0400 commit: Patch to fix IB collection in systems with
multiple mellanox cards
+0000000000000000000000000000000000000000
a34a0f47c1c2f387e2660c496d87ed84b04a87c5 Laurence Oberman <lober...@redhat.com>
1664458815 -0400 clone: from https://github.com/sharkcz/collectl.git
+a34a0f47c1c2f387e2660c496d87ed84b04a87c5
30ff18dc049d163d01599fee35226fa8e57ca5bc Laurence Oberman <lober...@redhat.com>
1666993467 -0400 commit: Added default support for rbd (Rados block) disks
to the default collectl.conf file
+30ff18dc049d163d01599fee35226fa8e57ca5bc
221d0a683f5487b103973f00f8ccc45c80a3dd07 Laurence Oberman <lober...@redhat.com>
1666993698 -0400 commit: Released 4.3.5 with default rbd device support
+221d0a683f5487b103973f00f8ccc45c80a3dd07
928e0a662a67b0c38f0d5ebacae3d28440d3e3f6 Laurence Oberman <lober...@redhat.com>
1667833128 -0500 commit: Added the tar file for colplot to our source tree
+928e0a662a67b0c38f0d5ebacae3d28440d3e3f6
625e2453842121519e9e5a38c283d02e72e2ed89 Laurence Oberman <lober...@redhat.com>
1669763984 -0500 commit: Removed the error check in sub vmstatInit
+625e2453842121519e9e5a38c283d02e72e2ed89
2001864971f91999216daf091529f5aa47d69150 Laurence Oberman <lober...@redhat.com>
1669764566 -0500 commit: Version 4.3.6 with fix in sub vmstatInit where
error check was removed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/logs/refs/remotes/origin/HEAD
new/collectl/.git/logs/refs/remotes/origin/HEAD
--- old/collectl/.git/logs/refs/remotes/origin/HEAD 2022-01-10
22:56:15.000000000 +0100
+++ new/collectl/.git/logs/refs/remotes/origin/HEAD 2022-09-29
15:40:15.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
+0000000000000000000000000000000000000000
a34a0f47c1c2f387e2660c496d87ed84b04a87c5 Laurence Oberman <lober...@redhat.com>
1664458815 -0400 clone: from https://github.com/sharkcz/collectl.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/logs/refs/remotes/origin/master
new/collectl/.git/logs/refs/remotes/origin/master
--- old/collectl/.git/logs/refs/remotes/origin/master 2022-01-12
18:00:47.000000000 +0100
+++ new/collectl/.git/logs/refs/remotes/origin/master 2022-11-30
00:31:09.000000000 +0100
@@ -1 +1,4 @@
-dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006847 -0500 update by push
+a34a0f47c1c2f387e2660c496d87ed84b04a87c5
221d0a683f5487b103973f00f8ccc45c80a3dd07 Laurence Oberman <lober...@redhat.com>
1666994021 -0400 update by push
+221d0a683f5487b103973f00f8ccc45c80a3dd07
928e0a662a67b0c38f0d5ebacae3d28440d3e3f6 Laurence Oberman <lober...@redhat.com>
1667833219 -0500 update by push
+928e0a662a67b0c38f0d5ebacae3d28440d3e3f6
625e2453842121519e9e5a38c283d02e72e2ed89 Laurence Oberman <lober...@redhat.com>
1669764302 -0500 update by push
+625e2453842121519e9e5a38c283d02e72e2ed89
2001864971f91999216daf091529f5aa47d69150 Laurence Oberman <lober...@redhat.com>
1669764669 -0500 update by push
Binary files
old/collectl/.git/objects/1f/6f30ec407fcdd1312f69197d9670b78baf1a2d and
new/collectl/.git/objects/1f/6f30ec407fcdd1312f69197d9670b78baf1a2d differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/collectl/.git/objects/20/01864971f91999216daf091529f5aa47d69150
new/collectl/.git/objects/20/01864971f91999216daf091529f5aa47d69150
--- old/collectl/.git/objects/20/01864971f91999216daf091529f5aa47d69150
1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/objects/20/01864971f91999216daf091529f5aa47d69150
2022-11-30 00:30:00.000000000 +0100
@@ -0,0 +1,2 @@
+xÁjÅ D»ö+î4è5jRÞöA¡»î$´ÆbÌK?¿þAwÃÀ k)k'öæ©7T¶YKÄQº SRZq¶^y¼urvÓ ²
+ÄwhØ:Y6àÑèidÅÊ(ôyÒI2 &/ÂÑÚè- ×.Þg´6zùªéÖÐXË+)k½³£±¥R\íåÙñø@Û׺Ñ8èÁÒ¹ö
òúCëFû1Ó£ì=ôûvq.h ´vùÆñΰSC©$ñ gû_Â
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/collectl/.git/objects/22/1d0a683f5487b103973f00f8ccc45c80a3dd07
new/collectl/.git/objects/22/1d0a683f5487b103973f00f8ccc45c80a3dd07
--- old/collectl/.git/objects/22/1d0a683f5487b103973f00f8ccc45c80a3dd07
1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/objects/22/1d0a683f5487b103973f00f8ccc45c80a3dd07
2022-10-28 23:48:35.000000000 +0200
@@ -0,0 +1,2 @@
+x[jÃ0EóUÌjô¶¡t@w0Ò°Á"§Û ;ÈßáÂ=\÷}í guéJ&Lspγ±
L$ÖiãL:©öR?:Y
+¥¤¼!©\
Ù8}ÁÀnÎèRxö¥6¸á9~á¸íøëVÿé§1-ا\÷oPÞû¾¤RutvþÜ ~yc|2Ìäàoí
<·-Ñà×:ÂçqÔÖÅWÚ
\ No newline at end of file
Binary files
old/collectl/.git/objects/23/342b21d9cfdc678f71d553a45e890a87d5ff4b and
new/collectl/.git/objects/23/342b21d9cfdc678f71d553a45e890a87d5ff4b differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/collectl/.git/objects/30/ff18dc049d163d01599fee35226fa8e57ca5bc
new/collectl/.git/objects/30/ff18dc049d163d01599fee35226fa8e57ca5bc
--- old/collectl/.git/objects/30/ff18dc049d163d01599fee35226fa8e57ca5bc
1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/objects/30/ff18dc049d163d01599fee35226fa8e57ca5bc
2022-10-28 23:45:03.000000000 +0200
@@ -0,0 +1,3 @@
+xÁNÃ0D9ç+öB¥ãØ$Ä +ô°±×JT; §
ÔÇm) ÀiggvVOï«À· k©mMY ÅT%ÑZ%ALóWXLiL@f
Ò¥æ¶jq)4YFtL`£t]àúáÜÓ¯ E#ܺpRLéF¥²m+!¬`¬ÈnæLôÿÅ£1dÀÅÅ%i
+1ÍP±3pù&Ìй ·W`y;C
+zú«èà éä2âhÁ§|÷<¸× ¬{óÝö0g±úÞ\ÃÞøÕÉókw²`opá×Ì9y=
OçhwÇÞ¸óÅx\2ça® I]¸
\ No newline at end of file
Binary files
old/collectl/.git/objects/33/a1251e8356fc35730a054085ad637e74128445 and
new/collectl/.git/objects/33/a1251e8356fc35730a054085ad637e74128445 differ
Binary files
old/collectl/.git/objects/51/7c19c94ae623eb7ab373edff1563328d03eb2b and
new/collectl/.git/objects/51/7c19c94ae623eb7ab373edff1563328d03eb2b differ
Binary files
old/collectl/.git/objects/55/b4c6cf86df8482960c13a9ac4ac98aed747d7f and
new/collectl/.git/objects/55/b4c6cf86df8482960c13a9ac4ac98aed747d7f differ
Binary files
old/collectl/.git/objects/59/0d90e85746d075667029ab4b23dbf49ffe5ce8 and
new/collectl/.git/objects/59/0d90e85746d075667029ab4b23dbf49ffe5ce8 differ
Binary files
old/collectl/.git/objects/5b/b4724733c6a90a9e378f3b2d4600d77dd9dc15 and
new/collectl/.git/objects/5b/b4724733c6a90a9e378f3b2d4600d77dd9dc15 differ
Binary files
old/collectl/.git/objects/62/5e2453842121519e9e5a38c283d02e72e2ed89 and
new/collectl/.git/objects/62/5e2453842121519e9e5a38c283d02e72e2ed89 differ
Binary files
old/collectl/.git/objects/68/33a16896beb7168b6c9699b89f295a665df02f and
new/collectl/.git/objects/68/33a16896beb7168b6c9699b89f295a665df02f differ
Binary files
old/collectl/.git/objects/71/808794b0498b5681667efc18f8c27462977778 and
new/collectl/.git/objects/71/808794b0498b5681667efc18f8c27462977778 differ
Binary files
old/collectl/.git/objects/86/850e42e9e57666b85029eef77ef19d268954ee and
new/collectl/.git/objects/86/850e42e9e57666b85029eef77ef19d268954ee differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
new/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
--- old/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
2022-01-12 17:58:09.000000000 +0100
+++ new/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-xKjÄ0D³Ö)úcÚúX2 !³d´¤VÆ0VYN® @]QU¯¨$ëºt0O½1CÔiìÈQ
-K@;ZYO:3f7{¶ÎµQãÚ!'£}¡hñtAËèí¡!ï¢eÏAÑÑïÒàK
oÛJ®ùU/óúd}q²qÜ têtÏÿ¿ n9s}ã´%í@QÜöE*ØÁ
¨f8¶ÐOµò×_ÜÞåh´VßYa±
\ No newline at end of file
Binary files
old/collectl/.git/objects/92/8e0a662a67b0c38f0d5ebacae3d28440d3e3f6 and
new/collectl/.git/objects/92/8e0a662a67b0c38f0d5ebacae3d28440d3e3f6 differ
Binary files
old/collectl/.git/objects/b2/c98e5a5ac800f0f8041422e262de0d597e4548 and
new/collectl/.git/objects/b2/c98e5a5ac800f0f8041422e262de0d597e4548 differ
Binary files
old/collectl/.git/objects/bb/bd6287e9cad13125eaf6b7594e400cbcf91191 and
new/collectl/.git/objects/bb/bd6287e9cad13125eaf6b7594e400cbcf91191 differ
Binary files
old/collectl/.git/objects/c1/5512199d67b32614e8f75e3f0be9f06235940a and
new/collectl/.git/objects/c1/5512199d67b32614e8f75e3f0be9f06235940a differ
Binary files
old/collectl/.git/objects/c5/6184555454e894b2aec136d3a1988798c0df76 and
new/collectl/.git/objects/c5/6184555454e894b2aec136d3a1988798c0df76 differ
Binary files
old/collectl/.git/objects/c8/f338ba7202351a971a708226ebe067ca9e9fc8 and
new/collectl/.git/objects/c8/f338ba7202351a971a708226ebe067ca9e9fc8 differ
Binary files
old/collectl/.git/objects/dd/fcdab78556e34fd39d3a45235b0b28f0282602 and
new/collectl/.git/objects/dd/fcdab78556e34fd39d3a45235b0b28f0282602 differ
Binary files
old/collectl/.git/objects/e1/1a1fd5b2963fb47821da6043dc0e793d552d82 and
new/collectl/.git/objects/e1/1a1fd5b2963fb47821da6043dc0e793d552d82 differ
Binary files
old/collectl/.git/objects/f4/5292a567eaf1a815470736849f7484e0c2323a and
new/collectl/.git/objects/f4/5292a567eaf1a815470736849f7484e0c2323a differ
Binary files
old/collectl/.git/objects/pack/pack-c0720a128ee6d380c3a5755df65b9e47ad3402b6.idx
and
new/collectl/.git/objects/pack/pack-c0720a128ee6d380c3a5755df65b9e47ad3402b6.idx
differ
Binary files
old/collectl/.git/objects/pack/pack-c0720a128ee6d380c3a5755df65b9e47ad3402b6.pack
and
new/collectl/.git/objects/pack/pack-c0720a128ee6d380c3a5755df65b9e47ad3402b6.pack
differ
Binary files
old/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.idx
and
new/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.idx
differ
Binary files
old/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.pack
and
new/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/packed-refs
new/collectl/.git/packed-refs
--- old/collectl/.git/packed-refs 2022-01-10 22:56:15.000000000 +0100
+++ new/collectl/.git/packed-refs 2022-09-29 15:40:15.000000000 +0200
@@ -1,5 +1,5 @@
-# pack-refs with: peeled fully-peeled
-dc327fab45370c2f04bf174f8003a75b5134e7e8 refs/remotes/origin/master
+# pack-refs with: peeled fully-peeled sorted
+a34a0f47c1c2f387e2660c496d87ed84b04a87c5 refs/remotes/origin/master
352b465ed938a4307c8ca1807d4943bcb4eb562f refs/tags/2.3.1
4e8c98be61cdb0fc3d7cd78aa4fc7827eb683ea0 refs/tags/2.3.2
fdc730dee91d438384cc34a28a1f168d6bead168 refs/tags/2.3.3
@@ -48,3 +48,5 @@
7e23c5ee7d8a0d193a0c414001f047ce4e5c24f1 refs/tags/4.3.0
42450515addc328251e62c4182b3a609698d26dc refs/tags/4.3.1
dc327fab45370c2f04bf174f8003a75b5134e7e8 refs/tags/4.3.2
+f14c9b0ba7d1e272492ab95d84ed43af0b6c0815 refs/tags/4.3.3
+a34a0f47c1c2f387e2660c496d87ed84b04a87c5 refs/tags/4.3.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/refs/heads/master
new/collectl/.git/refs/heads/master
--- old/collectl/.git/refs/heads/master 2022-04-01 17:53:32.000000000 +0200
+++ new/collectl/.git/refs/heads/master 2022-11-30 00:30:00.000000000 +0100
@@ -1 +1 @@
-517c19c94ae623eb7ab373edff1563328d03eb2b
+2001864971f91999216daf091529f5aa47d69150
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/.git/refs/remotes/origin/master
new/collectl/.git/refs/remotes/origin/master
--- old/collectl/.git/refs/remotes/origin/master 2022-01-12
18:00:47.000000000 +0100
+++ new/collectl/.git/refs/remotes/origin/master 2022-11-30
00:31:09.000000000 +0100
@@ -1 +1 @@
-8c37d5f9a64457b6e75f31d094503e4feb9808f0
+2001864971f91999216daf091529f5aa47d69150
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/RELEASE-collectl
new/collectl/RELEASE-collectl
--- old/collectl/RELEASE-collectl 2022-04-01 23:15:26.000000000 +0200
+++ new/collectl/RELEASE-collectl 2022-11-30 00:29:16.000000000 +0100
@@ -27,6 +27,17 @@
COLLECTL CHANGES
+4.3.6 November 29 2022
+ - Removed the error check in sub vmstatInit
+ It was erroneous and that option is seldom used.
+ Reported-by Bill Torpey
+
+4.3.5 October 28 2022
+ - Add default collection for Cepg rbd devices to the conf file
+
+4.3.4 August 24, 2022
+ - Add patch for dskopts=F to allow double digit precision on playback
+
4.3.3 Apr 1, 2022
- Minor fix for HCA stats with Mellanox HCA's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/collectl new/collectl/collectl
--- old/collectl/collectl 2022-04-01 23:16:45.000000000 +0200
+++ new/collectl/collectl 2022-11-30 00:28:02.000000000 +0100
@@ -111,7 +111,7 @@
$rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0;
$SrcArch= $Config{"archname"};
-$Version= '4.3.3';
+$Version= '4.3.6';
$Copyright='Copyright 2003-2018 Hewlett-Packard Development Company, L.P.';
$License= "collectl may be copied only under the terms of either the Artistic
License\n";
$License.= "or the GNU General Public License, which may be found in the
source kit";
@@ -1129,9 +1129,10 @@
print "RawNet - Ignore: $rawNetIgnore Keep: $rawNetFilter\n" if $debug & 1;
error("--dskopts f only applies to -sD") if $dskOpts=~/f/ &&
$subsys!~/D/;
+error("--dskopts F only applies to -sD") if $dskOpts=~/F/ &&
$subsys!~/D/;
error("--dskopts z only applies to -sD") if $dskOpts=~/z/ &&
$subsys!~/D/;
error("only valid value for --cpuopts is 'z'") if $cpuOpts ne '' &&
$cpuOpts!~/^[z]+$/;
-error("only valid values for --dskopts are 'fioz'") if $dskOpts ne '' &&
$dskOpts!~/^[fioz]+$/;
+error("only valid values for --dskopts are 'Ffioz'") if $dskOpts ne '' &&
$dskOpts!~/^[Ffioz]+$/;
error("only valid value for --xopts is 'i'") if $xOpts ne '' &&
$xOpts!~/^[i]+$/;
$netOptsW=5; # minumum width
@@ -6519,6 +6520,7 @@
if you don't know perl, a partial string will usually work too
--dskopts
f - include fractions for some of the detail output columns
+ F - add more double digit precision to the columns detail output
i - include average i/o size in brief mode (as with --iosize)
o - exclude unused devices from new headers and plot data
see docs on disk monitoring for more detail
@@ -6784,6 +6786,16 @@
{
my $whatsnew=<<EOF6;
What's new in collectl in the last year or so?
+
+verson 4.3.6 Novemeber 29 2022
+ - Removed the erroneous error check check in sub vmstatInit
+
+verson 4.3.5 October 28 2022
+ - Add default collection for Cepg rbd devices to the conf file
+
+version 4.3.4
+ - Add patch for dskopts=F to allow double digit precision on playback
+
version 4.3.3
- Fixed bug with stats for Mellanox adapters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/collectl.conf new/collectl/collectl.conf
--- old/collectl/collectl.conf 2022-01-10 22:56:15.000000000 +0100
+++ new/collectl/collectl.conf 2022-10-28 23:40:47.000000000 +0200
@@ -142,7 +142,7 @@
# ignored. To change the filter, set the string below to those you want to
keep BUT
# you need to know what a perl regular expression looks like or you may not
get the
# desired results. CAUTION - white space is CRITICAL for this to work.
-#DiskFilter = /hd[ab] | sd[a-z]+ |dm-\d+ |xvd[a-z] |fio[a-z]+ | vd[a-z]+
|emcpower[a-z]+ |psv\d+ |nvme\d+n\d+ /
+DiskFilter = /hd[ab] | sd[a-z]+ |dm-\d+ |xvd[a-z] |fio[a-z]+ | vd[a-z]+
|emcpower[a-z]+ |psv\d+ |nvme\d+n\d+ |rbd\d+ /
# Kernel Efficiency Test
# On kernels 2.6.32 forward (and you can't tell how distros patched) there is
a read inefficiency
Binary files old/collectl/colplot-5.0.0.src.tar.gz and
new/collectl/colplot-5.0.0.src.tar.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/formatit.ph new/collectl/formatit.ph
--- old/collectl/formatit.ph 2022-04-01 17:51:57.000000000 +0200
+++ new/collectl/formatit.ph 2022-09-29 15:40:15.000000000 +0200
@@ -6054,17 +6054,30 @@
# deal with --dskopts f format here
if (!defined($dskhdr1Format))
{
- if ($dskOpts!~/f/)
+ if ($dskOpts!~/f/ && $dskOpts!~/F/)
{
$dskhdr1Format="<---------reads---------------><---------writes--------------><--------averages-------->
Pct\n";
$dskhdr2Format=" KBytes Merged IOs Size Wait KBytes Merged IOs
Size Wait RWSize QLen Wait SvcTim Util\n";
$dskdetFormat="%s%-11s %6d %6d %4s %4s %5d %6d %6d %4s %4s %5d %5d
%5d %4d %4d %3d\n";
+ $dskPrint=1
}
else
{
-
$dskhdr1Format="<------------reads--------------><-------------writes------------><---------averages---------->
Pct\n";
- $dskhdr2Format=" KBytes Merged IOs Size Wait KBytes Merged
IOs Size Wait RWSize QLen Wait SvcTim Util\n";
- $dskdetFormat="%s%-11s %7.1f %6.0f %4s %4s %6.1f %7.1f %6.0f %4s %4s
%6.1f %6.1f %6.1f %6.1f %6.1f %5.2f\n";
+ if ($dskOpts!~/F/)
+ {
+
$dskhdr1Format="<------------reads--------------><-------------writes------------><---------averages---------->
Pct\n";
+ $dskhdr2Format=" KBytes Merged IOs Size Wait KBytes
Merged IOs Size Wait RWSize QLen Wait SvcTim Util\n";
+ $dskdetFormat="%s%-11s %7.1f %6.0f %4s %4s %6.1f %7.1f %6.0f %4s
%4s %6.1f %6.1f %6.1f %6.1f %6.1f %5.2f\n";
+ $dskPrint=1
+ }
+ else
+ {
+
$dskhdr1Format="<---------------------reads---------------------><---------------------writes--------------------><-------------averages------------->
Pct\n";
+ $dskhdr2Format=" KBytes Merged IOs Size
Wait KBytes Merged IOs Size Wait RWSize QLen
Wait SvcTim Util\n";
+ $dskdetFormat="%s%-11s %10.2f %8.2f %9.2f %7.2f %9.2f %10.2f
%8.2f %9.2f %7.2f %9.2f %7.2f %7.2f %9.2f %8.2f %6.2f\n";
+ $dskPrint=0
+ }
+
}
}
@@ -6093,13 +6106,26 @@
# If exception processing in effect, make sure this entry qualities
next if $options=~/x/ && $dskRead[$i]/$intSecs<$limIOS &&
$dskWrite[$i]/$intSecs<$limIOS;
- $line=sprintf($dskdetFormat,
+ if ($dskPrint)
+ {
+ $line=sprintf($dskdetFormat,
$datetime, $dskName,
$dskReadKB[$i]/$intSecs, $dskReadMrg[$i]/$intSecs,
cvt($dskRead[$i]/$intSecs),
$dskRead[$i] ? cvt($dskReadKB[$i]/$dskRead[$i],4,0,1) : 0,
$dskWaitR[$i],
$dskWriteKB[$i]/$intSecs, $dskWriteMrg[$i]/$intSecs,
cvt($dskWrite[$i]/$intSecs),
$dskWrite[$i] ? cvt($dskWriteKB[$i]/$dskWrite[$i],4,0,1) : 0,
$dskWaitW[$i],
$dskRqst[$i], $dskQueLen[$i], $dskWait[$i], $dskSvcTime[$i],
$dskUtil[$i]);
+ }
+ else
+ {
+ $line=sprintf($dskdetFormat,
+ $datetime, $dskName,
+ $dskReadKB[$i]/$intSecs, $dskReadMrg[$i]/$intSecs,
$dskRead[$i]/$intSecs,
+ $dskRead[$i] ? $dskReadKB[$i]/$dskRead[$i] : 0,
$dskWaitR[$i],
+ $dskWriteKB[$i]/$intSecs, $dskWriteMrg[$i]/$intSecs,
$dskWrite[$i]/$intSecs,
+ $dskWrite[$i] ? $dskWriteKB[$i]/$dskWrite[$i] : 0,
$dskWaitW[$i],
+ $dskRqst[$i], $dskQueLen[$i], $dskWait[$i], $dskSvcTime[$i],
$dskUtil[$i]);
+ }
printText($line);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl/vmstat.ph new/collectl/vmstat.ph
--- old/collectl/vmstat.ph 2022-01-10 22:56:15.000000000 +0100
+++ new/collectl/vmstat.ph 2022-11-30 00:19:36.000000000 +0100
@@ -1,6 +1,5 @@
sub vmstatInit
{
- error("-s not allowed with 'vmstat'") if $userSubsys ne '';
error("-f requires either --rawtoo or -P") if $filename ne '' &&
!$rawtooFlag && !$plotFlag;
error("-P or --rawtoo require -f") if $filename eq '' &&
($rawtooFlag || $plotFlag);
$subsys=$userSubsys='cm';
