April 2021 - openSUSE Commits - openSUSE Mailing Lists

commit abootimg for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package abootimg for openSUSE:Factory checked in at 2021-05-01 00:46:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abootimg (Old) and /work/SRC/openSUSE:Factory/.abootimg.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abootimg" Sat May 1 00:46:44 2021 rev:6 rq:889474 version:0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/abootimg/abootimg.changes 2016-02-09 13:33:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.abootimg.new.1947/abootimg.changes 2021-05-01 00:46:47.467427303 +0200 @@ -1,0 +2,7 @@ +Sat Apr 17 16:28:36 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Fixed and cleaned SPEC file + * Provide working URL + * Minor modernization + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abootimg.spec ++++++ --- /var/tmp/diff_new_pack.VmVU8s/_old 2021-05-01 00:46:47.971425057 +0200 +++ /var/tmp/diff_new_pack.VmVU8s/_new 2021-05-01 00:46:47.971425057 +0200 @@ -1,7 +1,7 @@ # # spec file for package abootimg # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,12 @@ Version: 0.6 Release: 0 Summary: Android boot image manipulator -License: GPL-2.0+ and Apache-2.0 +License: Apache-2.0 AND GPL-2.0-or-later Group: System/Boot -Url: http://gitorious.org/ac100/abootimg +URL: https://github.com/ggrandou/abootimg Source: %{name}.tar.bz2 +BuildRequires: pkgconfig BuildRequires: pkgconfig(blkid) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Android boot image manipulator. It can create/update/unpack boot.img - boot @@ -36,8 +36,8 @@ %build # First make clean as a binary already exists in the tarball -make %{?_smp_mflags} clean -make %{?_smp_mflags} CFLAGS="%{optflags}" +%make_build clean +%make_build CFLAGS="%{optflags}" %install install -D -m 0755 abootimg %{buildroot}/%{_bindir}/abootimg @@ -46,10 +46,9 @@ install -D -m 0644 debian/abootimg.1 %{buildroot}/%{_mandir}/man1/abootimg.1 %files -%defattr(-,root,root) %{_bindir}/abootimg %{_bindir}/abootimg-pack-initrd %{_bindir}/abootimg-unpack-initrd -%{_mandir}/man1/abootimg.1%{ext_man} +%{_mandir}/man1/abootimg.1%{?ext_man} %changelog

1 0

commit glyr for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glyr for openSUSE:Factory checked in at 2021-05-01 00:46:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glyr (Old) and /work/SRC/openSUSE:Factory/.glyr.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glyr" Sat May 1 00:46:45 2021 rev:20 rq:889477 version:1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/glyr/glyr.changes 2017-02-03 17:40:55.469326986 +0100 +++ /work/SRC/openSUSE:Factory/.glyr.new.1947/glyr.changes 2021-05-01 00:46:48.191424077 +0200 @@ -1,0 +2,6 @@ +Fri Apr 30 02:44:25 UTC 2021 - andreas(a)andreasvoegele.com + +- Use %cmake_build and %license macros. +- Set License to LGPL-3.0-or-later. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glyr.spec ++++++ --- /var/tmp/diff_new_pack.vTZHXq/_old 2021-05-01 00:46:48.703421797 +0200 +++ /var/tmp/diff_new_pack.vTZHXq/_new 2021-05-01 00:46:48.703421797 +0200 @@ -1,7 +1,7 @@ # # spec file for package glyr # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,9 +22,9 @@ Version: 1.0.10 Release: 0 Summary: Search engine for music related metadata -License: LGPL-3.0 +License: LGPL-3.0-or-later Group: Productivity/Networking/Web/Utilities -Url: https://github.com/sahib/glyr +URL: https://github.com/sahib/glyr Source0: https://github.com/sahib/%{name}/archive/%{version}.tar.gz#/%{name}-%{versi… Source100: baselibs.conf # PATCH-FIX-OPENSUSE glyr-date-n-time.patch lazy.kent(a)opensuse.org -- remove __DATE__ and __TIME__ that causes the package to rebuild when not needed @@ -97,7 +97,7 @@ %build %cmake -make %{?_smp_mflags} VERBOSE=1 +%cmake_build %install %cmake_install @@ -108,17 +108,19 @@ %files -n glyrc %defattr(-,root,root,-) -%doc AUTHORS COPYING README.textile state_of_providers.txt +%license COPYING +%doc AUTHORS README.textile state_of_providers.txt %{_bindir}/glyrc %files -n lib%{name}%{major} %defattr(-,root,root,-) -%doc COPYING +%license COPYING %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) -%doc AUTHORS COPYING README.textile state_of_providers.txt +%license COPYING +%doc AUTHORS README.textile state_of_providers.txt %doc src/examples %{_includedir}/%{name}/ %{_libdir}/*.so

1 0

commit percona-toolkit for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package percona-toolkit for openSUSE:Factory checked in at 2021-05-01 00:46:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/percona-toolkit (Old) and /work/SRC/openSUSE:Factory/.percona-toolkit.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "percona-toolkit" Sat May 1 00:46:42 2021 rev:39 rq:889469 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/percona-toolkit/percona-toolkit.changes 2021-04-26 16:40:23.702151506 +0200 +++ /work/SRC/openSUSE:Factory/.percona-toolkit.new.1947/percona-toolkit.changes 2021-05-01 00:46:46.771430403 +0200 @@ -1,0 +2,9 @@ +Fri Apr 30 06:39:28 UTC 2021 - Denys Kondratenko <stdden(a)opensuse.org> + +- Percona Toolkit v3.3.1: + * BEFORE triggers are dropped after pt-online-schema-change run + * pt-summary reports wrong memory size + * drop_swap can drop triggers + * Column data lost when ��Generated�� is in the column comment + +------------------------------------------------------------------- Old: ---- percona-toolkit-3.3.0.tar.gz New: ---- percona-toolkit-3.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ percona-toolkit.spec ++++++ --- /var/tmp/diff_new_pack.uHrv6l/_old 2021-05-01 00:46:47.263428212 +0200 +++ /var/tmp/diff_new_pack.uHrv6l/_new 2021-05-01 00:46:47.263428212 +0200 @@ -17,7 +17,7 @@ Name: percona-toolkit -Version: 3.3.0 +Version: 3.3.1 Release: 0 Summary: Advanced MySQL and system command-line tools License: GPL-2.0-only ++++++ percona-toolkit-3.3.0.tar.gz -> percona-toolkit-3.3.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/percona-toolkit/percona-toolkit-3.3.0.tar.gz /work/SRC/openSUSE:Factory/.percona-toolkit.new.1947/percona-toolkit-3.3.1.tar.gz differ: char 5, line 1 ++++++ percona-toolkit.conf ++++++ --- /var/tmp/diff_new_pack.uHrv6l/_old 2021-05-01 00:46:47.315427980 +0200 +++ /var/tmp/diff_new_pack.uHrv6l/_new 2021-05-01 00:46:47.319427962 +0200 @@ -1,7 +1,7 @@ ## Default configuration for all Percona Toolkit tools in the ## openSUSE package ## -## For syntax see http://www.percona.com/doc/percona-toolkit/2.2/configuration_files.html +## For syntax see https://www.percona.com/doc/percona-toolkit/3.0/configuration_files.html ## ## The configuration files are read in order: ## 1. /etc/percona-toolkit/percona-toolkit.conf

1 0

commit neix for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package neix for openSUSE:Factory checked in at 2021-05-01 00:46:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neix (Old) and /work/SRC/openSUSE:Factory/.neix.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "neix" Sat May 1 00:46:41 2021 rev:2 rq:889473 version:0.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/neix/neix.changes 2020-09-08 22:50:49.795618668 +0200 +++ /work/SRC/openSUSE:Factory/.neix.new.1947/neix.changes 2021-05-01 00:46:45.759434911 +0200 @@ -1,0 +2,6 @@ +Fri Apr 30 07:27:56 UTC 2021 - Michael Vetter <mvetter(a)suse.com> + +- Update to 0.1.4: + * Fix issue #16 + +------------------------------------------------------------------- Old: ---- v0.1.3.tar.gz New: ---- v0.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neix.spec ++++++ --- /var/tmp/diff_new_pack.usj7cZ/_old 2021-05-01 00:46:46.467431757 +0200 +++ /var/tmp/diff_new_pack.usj7cZ/_new 2021-05-01 00:46:46.471431740 +0200 @@ -1,7 +1,7 @@ # # spec file for package neix # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: neix -Version: 0.1.3 +Version: 0.1.4 Release: 0 Summary: News Reader for Text Terminals License: GPL-3.0-or-later ++++++ v0.1.3.tar.gz -> v0.1.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/neix/v0.1.3.tar.gz /work/SRC/openSUSE:Factory/.neix.new.1947/v0.1.4.tar.gz differ: char 13, line 1

1 0

commit calibre for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2021-05-01 00:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calibre" Sat May 1 00:46:39 2021 rev:253 rq:889457 version:5.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2021-04-19 21:06:15.628052860 +0200 +++ /work/SRC/openSUSE:Factory/.calibre.new.1947/calibre.changes 2021-05-01 00:46:44.703439616 +0200 @@ -1,0 +2,47 @@ +Fri Apr 30 05:47:57 UTC 2021 - ecsos <ecsos(a)opensuse.org> + +- Update to 1.17.0 + * New Features + - E-book viewer: Image popup: Allow dragging with the mouse to + pan the image + - Sort button: Allow selecting which columns are in the popup + sort menu + - E-book viewer: When suggesting a default bookmark title, + use the name of the current chapter + - E-book viewer: When searching the Table of Contents allow + holding the Shift key to search backwards + - E-book viewer: Add a shortcut Ctrl+0 to restore default font + size + * Bug Fixes + - Windows MTP driver: Rewrite parts of the driver in the hope + of fixing some rare and hard to reproduce crashes + - Windows MTP driver: Set modified and created times when + putting files/folders on device. Also read modified time + correctly. + - Windows: E-book viewer: Fix switching away from viewer while + in full screen and switching back causing some corruption + until the page is scrolled + - Fix a regression in the previous release that caused errors + when editing empty date values + - Get books: Update Gutenberg plugin for website changes + - E-book viewer: The quick highlight button should replace the + style of an existing highlight, when one is selected + - Elide long items in the middle when showing the completion + popup for tags, to make it easier to use with hierarchical + tags + - E-book viewer: Read aloud: Fix soft hyphens causing read + aloud words to be broken up + - E-book viewer: Right clicking when text is selected should + extend the selection instead of doing nothing + - Fix settings in the ToC Editor tool being forgotten when + calibre is closed + - DOCX Output: Fix conversion failing if the input document has + missing images + - Content server viewer: Fix mouse wheel scrolling not working + on the box used to edit notes for highlights + - E-book viewer: Fix read aloud word tracking in flow mode not + very reliable + - E-book viewer: Fix navigation shortcuts not working in Read + aloud mode + +------------------------------------------------------------------- Old: ---- calibre-5.16.1.tar.xz calibre-5.16.1.tar.xz.sig New: ---- calibre-5.17.0.tar.xz calibre-5.17.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.pLVoq3/_old 2021-05-01 00:46:45.563435784 +0200 +++ /var/tmp/diff_new_pack.pLVoq3/_new 2021-05-01 00:46:45.563435784 +0200 @@ -17,7 +17,7 @@ Name: calibre -Version: 5.16.1 +Version: 5.17.0 Release: 0 Summary: EBook Management Application License: GPL-3.0-only ++++++ calibre-5.16.1.tar.xz -> calibre-5.17.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/calibre/calibre-5.16.1.tar.xz /work/SRC/openSUSE:Factory/.calibre.new.1947/calibre-5.17.0.tar.xz differ: char 25, line 1

1 0

commit openvswitch for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2021-05-01 00:46:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvswitch (Old) and /work/SRC/openSUSE:Factory/.openvswitch.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvswitch" Sat May 1 00:46:38 2021 rev:55 rq:889415 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes 2021-02-15 23:19:40.363698026 +0100 +++ /work/SRC/openSUSE:Factory/.openvswitch.new.1947/openvswitch.changes 2021-05-01 00:46:43.299445870 +0200 @@ -1,0 +2,6 @@ +Thu Apr 29 16:05:49 UTC 2021 - Jaime Caama��o Ruiz <jcaamano(a)suse.com> + +- Replace deprecated /var/run with /run (bsc#1185176, bsc#1185177). + * 0001-Replace-deprecated-var-run-with-run.patch + +------------------------------------------------------------------- New: ---- 0001-Replace-deprecated-var-run-with-run.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.p9h8aa/_old 2021-05-01 00:46:44.075442413 +0200 +++ /var/tmp/diff_new_pack.p9h8aa/_new 2021-05-01 00:46:44.075442413 +0200 @@ -68,6 +68,8 @@ Patch2: 0001-Don-t-change-permissions-of-dev-hugepages.patch # PATCH-FIX-OPENSUSE: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch Patch3: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch +# PATCH-FIX-OPENSUSE: 0001-Replace-deprecated-var-run-with-run.patch +Patch4: 0001-Replace-deprecated-var-run-with-run.patch #OVN patches # PATCH-FIX-OPENSUSE: 0001-Run-ovn-as-openvswitch-openvswitch.patch Patch20: 0001-Run-ovn-as-openvswitch-openvswitch.patch @@ -395,6 +397,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cd %{ovn_dir} %patch20 -p1 ++++++ 0001-Replace-deprecated-var-run-with-run.patch ++++++ From 89ddd0707175de0f56b605a45afd9926cb80826f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaamano(a)suse.com> Date: Thu, 29 Apr 2021 18:00:12 +0200 Subject: [PATCH] Replace deprecated /var/run with /run --- rhel/etc_logrotate.d_openvswitch | 4 ++-- rhel/usr_lib_systemd_system_openvswitch-ipsec.service | 2 +- ...sr_lib_systemd_system_ovs-delete-transient-ports.service | 2 +- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 6 +++--- rhel/usr_lib_systemd_system_ovsdb-server.service | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch index eaf1fd5bf..fa6303873 100644 --- a/rhel/etc_logrotate.d_openvswitch +++ b/rhel/etc_logrotate.d_openvswitch @@ -13,8 +13,8 @@ missingok postrotate # Tell Open vSwitch daemons to reopen their log files - if [ -d /var/run/openvswitch ]; then - for ctl in /var/run/openvswitch/*.ctl; do + if [ -d /run/openvswitch ]; then + for ctl in /run/openvswitch/*.ctl; do ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : done fi diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service index 3c4a40138..ec86874cb 100644 --- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service +++ b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service @@ -5,7 +5,7 @@ After=openvswitch.service [Service] Type=forking -PIDFile=/var/run/openvswitch/ovs-monitor-ipsec.pid +PIDFile=/run/openvswitch/ovs-monitor-ipsec.pid ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --ike-daemon=strongswan start-ovs-ipsec ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec diff --git a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service index 4cd4d7f57..d4d7b204b 100644 --- a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service +++ b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service @@ -2,7 +2,7 @@ Description=Open vSwitch Delete Transient Ports After=ovsdb-server.service Before=ovs-vswitchd.service -AssertPathExists=/var/run/openvswitch/db.sock +AssertPathExists=/run/openvswitch/db.sock [Service] Type=oneshot diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in index 08355d950..71c49dc59 100644 --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in @@ -4,14 +4,14 @@ After=ovsdb-server.service network-pre.target systemd-udev-settle.service Before=network.target network.service Requires=ovsdb-server.service ReloadPropagatedFrom=ovsdb-server.service -AssertPathIsReadWrite=/var/run/openvswitch/db.sock +AssertPathIsReadWrite=/run/openvswitch/db.sock PartOf=openvswitch.service [Service] Type=forking -PIDFile=/var/run/openvswitch/ovs-vswitchd.pid +PIDFile=/run/openvswitch/ovs-vswitchd.pid Restart=on-failure -Environment=XDG_RUNTIME_DIR=/var/run/openvswitch +Environment=XDG_RUNTIME_DIR=/run/openvswitch EnvironmentFile=/etc/openvswitch/default.conf EnvironmentFile=-/etc/sysconfig/openvswitch EnvironmentFile=-/run/openvswitch.useropts diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service index 98338b9df..49dc06e38 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service @@ -7,7 +7,7 @@ PartOf=openvswitch.service [Service] Type=forking -PIDFile=/var/run/openvswitch/ovsdb-server.pid +PIDFile=/run/openvswitch/ovsdb-server.pid Restart=on-failure EnvironmentFile=/etc/openvswitch/default.conf EnvironmentFile=-/etc/sysconfig/openvswitch @@ -18,7 +18,7 @@ EnvironmentFile=-/run/openvswitch.useropts # OVS_USER_ID from default.conf or sysconfig. ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts -ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch +ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ -- 2.26.2

1 0

commit 7kaa for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 7kaa for openSUSE:Factory checked in at 2021-05-01 00:46:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/7kaa (Old) and /work/SRC/openSUSE:Factory/.7kaa.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "7kaa" Sat May 1 00:46:36 2021 rev:9 rq:889360 version:2.15.4p1 Changes: -------- --- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes 2020-07-17 20:51:29.000959922 +0200 +++ /work/SRC/openSUSE:Factory/.7kaa.new.1947/7kaa.changes 2021-05-01 00:46:42.323450218 +0200 @@ -1,0 +2,5 @@ +Tue Apr 27 22:55:46 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Fixed music version requirement (align with music package) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 7kaa.spec ++++++ --- /var/tmp/diff_new_pack.CDJOD7/_old 2021-05-01 00:46:43.003447189 +0200 +++ /var/tmp/diff_new_pack.CDJOD7/_new 2021-05-01 00:46:43.007447171 +0200 @@ -1,7 +1,7 @@ # # spec file for package 7kaa # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,9 @@ # +%define base_version 2.15 Name: 7kaa -Version: 2.15.4p1 +Version: %{base_version}.4p1 Release: 0 Summary: Seven Kingdoms: Ancient Adversaries License: GPL-2.0-only @@ -38,7 +39,7 @@ BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) -Recommends: %{name}-music >= 20181228 +Recommends: %{name}-music >= %{base_version} %description Seven Kingdoms made departures from the traditional real-time strategy models

1 0

commit opentyrian for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package opentyrian for openSUSE:Factory checked in at 2021-05-01 00:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opentyrian (Old) and /work/SRC/openSUSE:Factory/.opentyrian.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opentyrian" Sat May 1 00:46:35 2021 rev:2 rq:889356 version:2.1.20201203 Changes: -------- --- /work/SRC/openSUSE:Factory/opentyrian/opentyrian.changes 2020-10-06 17:10:45.877509365 +0200 +++ /work/SRC/openSUSE:Factory/.opentyrian.new.1947/opentyrian.changes 2021-05-01 00:46:41.607453408 +0200 @@ -1,0 +2,6 @@ +Sun Apr 11 00:17:16 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to current git version +- Dropped upstream merged opl.patch + +------------------------------------------------------------------- Old: ---- opentyrian-2.1.20130907.tar.gz opl.patch New: ---- _service opentyrian-2.1.20201203.obscpio opentyrian.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opentyrian.spec ++++++ --- /var/tmp/diff_new_pack.bJ93J2/_old 2021-05-01 00:46:42.183450841 +0200 +++ /var/tmp/diff_new_pack.bJ93J2/_new 2021-05-01 00:46:42.183450841 +0200 @@ -1,7 +1,7 @@ # # spec file for package opentyrian # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,24 @@ Name: opentyrian -Version: 2.1.20130907 +# Upstream haven not tagged a version for more than seven years now. +# There quite many bugfixes in the git version and it seems upstreams +# develops it as rolling release. +Version: 2.1.20201203 Release: 0 Summary: An arcade-style vertical scrolling shooter License: GPL-2.0-or-later Group: Amusements/Games/Action/Arcade URL: https://github.com/opentyrian/opentyrian -Source: https://github.com/opentyrian/opentyrian/archive/v2.1.20130907.tar.gz#/%{na… +Source: %{name}-%{version}.tar.xz # PATCH-FEATURE-UPSTREAM https://github.com/opentyrian/opentyrian/pull/13 Patch0: appdata.patch -# PATCH-FIX-UPSTREAM https://github.com/opentyrian/opentyrian/commit/962ee8fc46ca51691bde1c8c102… -Patch1: opl.patch -BuildRequires: SDL-devel -BuildRequires: SDL_mixer-devel -BuildRequires: SDL_net-devel -BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files +BuildRequires: pkgconfig(SDL2_net) +BuildRequires: pkgconfig(sdl2) %description OpenTyrian is a port of the DOS shoot-em-up Tyrian. Thanks to Jason Emery, @@ -52,36 +51,42 @@ chmod -x CREDITS %build -make %{?_smp_mflags} STRIP=/bin/true MAKECMDGOALS=release +make %{?_smp_mflags} all \ + STRIP=/bin/true \ + prefix="%{_prefix}" \ + gamesdir="%{_datadir}" \ + OPENTYRIAN_VERSION=%{version} %install -# install binaries -install -D -m 0755 opentyrian %{buildroot}%{_libexecdir}/%{name}/opentyrian -# install wrapper -mkdir -p %{buildroot}%{_bindir} -cat <<EOT >>%{buildroot}%{_bindir}/%{name} -#!/bin/sh -cd %{_datadir}/opentyrian -%{_libexecdir}/%{name}/opentyrian -cd - -EOT -chmod +x %{buildroot}%{_bindir}/%{name} -# install man page -install -D -m 0644 linux/man/opentyrian.6 %{buildroot}%{_mandir}/man6/opentyrian.6 -# install icon and desktop file -for res in 128 48 32 24 22; do - install -D -m 0644 linux/icons/tyrian-$res.png "%{buildroot}%{_datadir}/icons/hicolor/$res"x"$res/apps/opentyrian.png" +make %{?_smp_mflags} install \ + DESTDIR="%{buildroot}" \ + docdir="%{_docdir}/%{name}" \ + prefix="%{_prefix}" \ + gamesdir="%{_datadir}" \ + OPENTYRIAN_VERSION=%{version} +# Gamedata directory (for the Freeware Tyrian21 files +mkdir -p %{buildroot}%{_datadir}/%{name} + +# Install .desktop file and appdata +cd linux +install -D %{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%suse_update_desktop_file -i %{name} +for size in 128 24 32 48; do + install -D icons/tyrian-$size.png "%{buildroot}%{_datadir}/icons/hicolor/${size}x$size/apps/%{name}.png" done -install -D -m 0644 linux/opentyrian.desktop %{buildroot}%{_datadir}/applications/opentyrian.desktop -install -D -m 0644 linux/opentyrian.appdata.xml %{buildroot}%{_datadir}/appdata/opentyrian.appdata.xml -%suse_update_desktop_file %{name} -%fdupes -s %{buildroot} +%fdupes -s %{buildroot}%{_datadir} + +%post +echo "For running %{name} you have to download the Tyrian Freeware game assets. +They can be be found here: https://www.camanis.net/tyrian/tyrian21.zip +Unpack them and put them into %{_datadir}/%{name} +" %files %license COPYING -%doc CREDITS NEWS README +%doc %{_docdir}/%{name} %{_bindir}/%{name} -%{_libexecdir}/%{name}/ +%dir %{_datadir}/%{name} %{_mandir}/man6/* %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/applications/%{name}.desktop ++++++ _service ++++++ <services> <service name="obs_scm" mode="localonly"> <param name="url">https://github.com/opentyrian/opentyrian.git</param> <param name="scm">git</param> <param name="versionformat">%cd</param> <param name="versionprefix">2.1</param> </service> <service name="set_version" mode="localonly" /> <service name="tar" mode="buildtime" /> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ opentyrian.obsinfo ++++++ name: opentyrian version: 2.1.20201203 mtime: 1607059401 commit: 650e1f72fd18d2242d10d706afa7f77f80151aea

1 0

commit attractmode for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package attractmode for openSUSE:Factory checked in at 2021-05-01 00:46:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attractmode (Old) and /work/SRC/openSUSE:Factory/.attractmode.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "attractmode" Sat May 1 00:46:34 2021 rev:7 rq:889354 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/attractmode/attractmode.changes 2020-03-31 17:14:44.331608303 +0200 +++ /work/SRC/openSUSE:Factory/.attractmode.new.1947/attractmode.changes 2021-05-01 00:46:40.955456312 +0200 @@ -1,0 +2,5 @@ +Thu Apr 22 08:35:24 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Minor SPEC file fix, fixed broken URL + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attractmode.spec ++++++ --- /var/tmp/diff_new_pack.rKnh25/_old 2021-05-01 00:46:41.399454334 +0200 +++ /var/tmp/diff_new_pack.rKnh25/_new 2021-05-01 00:46:41.403454316 +0200 @@ -1,7 +1,7 @@ # # spec file for package attractmode # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,12 @@ Summary: A graphical frontend for emulators License: GPL-3.0-only Group: System/Emulators/Other -URL: https://attractmode.org +URL: http://attractmode.org Source0: https://github.com/mickelson/attract/archive/v%{version}/attract-%{version}… BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: libjpeg8-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -38,10 +39,10 @@ BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(sfml-all) >= 2.0 BuildRequires: pkgconfig(xcb-xinerama) Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -BuildRequires: sfml2-devel %description Attract-Mode is a graphical frontend for command line emulators such as MAME, @@ -66,20 +67,11 @@ # Hardlinks so users can copy it %fdupes %{buildroot}%{_datadir}/attract -%post -%desktop_database_post - -%postun -%desktop_database_postun - %files %doc Readme.md %license License.txt %{_bindir}/attract %{_datadir}/attract -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/512x512 -%dir %{_datadir}/icons/hicolor/512x512/apps %{_datadir}/icons/hicolor/512x512/apps/attract-mode.png %{_datadir}/applications/attract-mode.desktop %{_datadir}/appdata/attract-mode.appdata.xml

1 0

commit collectl for openSUSE:Factory
by Source-Sync 30 Apr '21

30 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package collectl for openSUSE:Factory checked in at 2021-05-01 00:46:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectl (Old) and /work/SRC/openSUSE:Factory/.collectl.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectl" Sat May 1 00:46:33 2021 rev:34 rq:888536 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2018-09-11 17:21:05.755061312 +0200 +++ /work/SRC/openSUSE:Factory/.collectl.new.1947/collectl.changes 2021-05-01 00:46:40.183459751 +0200 @@ -1,0 +2,11 @@ +Sat Nov 14 20:21:44 UTC 2020 - Egbert Eich <eich(a)suse.com> + +- Update to 4.3.1 + * Bugfix: If playing back a file with -P in its name, collectl + incorrectly interprets it as the plot format flag. + * Bugfix: incorrectly dividing $dskWaitR and $dskWaitW by $intSecs + * Added 'm' switch to vmsum to only report VMs whose instance id is + >- this minimum value +- Fix permissions of non-executible script files. + +------------------------------------------------------------------- Old: ---- collectl-4.3.0.src.tar.gz New: ---- collectl-4.3.1.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectl.spec ++++++ --- /var/tmp/diff_new_pack.fBbRCg/_old 2021-05-01 00:46:40.743457256 +0200 +++ /var/tmp/diff_new_pack.fBbRCg/_new 2021-05-01 00:46:40.743457256 +0200 @@ -1,7 +1,7 @@ # # spec file for package collectl # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: collectl -Version: 4.3.0 +Version: 4.3.1 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: http://collectl.sourceforge.net Source0: http://sourceforge.net/projects/collectl/files/collectl/%{name}-%{version}/… Source1: collectl.service Source2: collectl.sysconfig @@ -58,13 +58,13 @@ mkdir -p %{buildroot}/%{_sbindir} ln -s %{_bindir}/collectl %{buildroot}/%{_sbindir}/collectl install -m 644 -D collectl.conf %{buildroot}/%{_sysconfdir}/collectl.conf -install -D formatit.ph %{buildroot}%{_datadir}/%{name}/formatit.ph -install -D lexpr.ph %{buildroot}%{_datadir}/%{name}/lexpr.ph -install -D gexpr.ph %{buildroot}%{_datadir}/%{name}/gexpr.ph -install -D misc.ph %{buildroot}%{_datadir}/%{name}/misc.ph -install -D hello.ph %{buildroot}%{_datadir}/%{name}/hello.ph -install -D graphite.ph %{buildroot}%{_datadir}/%{name}/graphite.ph -install -D vmstat.ph %{buildroot}%{_datadir}/%{name}/vmstat.ph +install -m 644 -D formatit.ph %{buildroot}%{_datadir}/%{name}/formatit.ph +install -m 644 -D lexpr.ph %{buildroot}%{_datadir}/%{name}/lexpr.ph +install -m 644 -D gexpr.ph %{buildroot}%{_datadir}/%{name}/gexpr.ph +install -m 644 -D misc.ph %{buildroot}%{_datadir}/%{name}/misc.ph +install -m 644 -D hello.ph %{buildroot}%{_datadir}/%{name}/hello.ph +install -m 644 -D graphite.ph %{buildroot}%{_datadir}/%{name}/graphite.ph +install -m 644 -D vmstat.ph %{buildroot}%{_datadir}/%{name}/vmstat.ph install -m 644 -D %{SOURCE1} %{buildroot}/%{_unitdir}/collectl.service ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rccollectl install -m 644 -D %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.collectl ++++++ collectl-4.3.0.src.tar.gz -> collectl-4.3.1.src.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/RELEASE-collectl new/collectl-4.3.1/RELEASE-collectl --- old/collectl-4.3.0/RELEASE-collectl 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/RELEASE-collectl 2018-11-01 14:47:48.000000000 +0100 @@ -27,6 +27,13 @@ COLLECTL CHANGES +4.3.1 Sept 13, 2018 + - very minor bug. If playing back a file with -P in its name, collectl + incorrectly interprets it as the plot format flag! [thanks laurence] + - incorrectly dividing $dskWaitR and $dskWaitW by $intSecs [thanks Jan] + - added 'm' switch to vmsum to only report VMs whose instance id is + >- this minimum value + 4.3.0 Oct 3, 2017 - disable -sL, should have been done at same time -sl was @@ -141,6 +148,11 @@ COLMUX CHANGES +5.0.0 + - getHeader routine, removing -c/-i need to look for leading spaces + when stipping switches in case a UUID in command string which can + contain -c following by a hex string + 4.9.2 - if ping fails, it still tries to ssh and fails, generating meaninlgess uninitialized variable errors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/collectl new/collectl-4.3.1/collectl --- old/collectl-4.3.0/collectl 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/collectl 2018-11-01 14:47:48.000000000 +0100 @@ -111,8 +111,8 @@ $rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0; $SrcArch= $Config{"archname"}; -$Version= '4.3.0-1'; -$Copyright='Copyright 2003-2017 Hewlett-Packard Development Company, L.P.'; +$Version= '4.3.1-1'; +$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"; @@ -363,7 +363,7 @@ $plotFlag=0; for (my $i=0; $i<scalar(@ARGV); $i++) { - $plotFlag=1 if $ARGV[$i]=~/-P|--plo/; # see if -P specified for setting --hr below + $plotFlag=1 if $ARGV[$i]=~/^-P|^--plo/; # see if -P specified for setting --hr below if ($ARGV[$i]=~/--to/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/colmux new/collectl-4.3.1/colmux --- old/collectl-4.3.0/colmux 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/colmux 2018-11-01 14:47:48.000000000 +0100 @@ -73,8 +73,8 @@ my $Collectl="$BinDir/collectl"; my $Program='colmux'; -my $Version='4.9.2'; -my $Copyright='Copyright 2005-2017 Hewlett-Packard Development Company, L.P.'; +my $Version='5.0.0'; +my $Copyright='Copyright 2005-2018 Hewlett-Packard Development Company, L.P.'; my $License="colmux 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"; @@ -2140,8 +2140,8 @@ my $command=shift; # in case -c or -i included, they conflict with -showheader - $command=~s/-c\s*\S+//; - $command=~s/-i\s*:*\d+//; + $command=~s/ -c\s*\S+/ /; + $command=~s/ -i\s*:*\d+/ /; my $cmd="$access $Collectl $command --showcolheaders"; $cmd=~s/--fr\S+\s+\S*//; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/docs/#Data-verbose.html# new/collectl-4.3.1/docs/#Data-verbose.html# --- old/collectl-4.3.0/docs/#Data-verbose.html# 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/docs/#Data-verbose.html# 1970-01-01 01:00:00.000000000 +0100 @@ -1,832 +0,0 @@ -<html> -<head> -<link rel=stylesheet href="style.css" type="text/css"> -<title>Verbose Data</title> -</head> - -<body> -<center><h1>Verbose Data</h1></center> -<p> - -Data is reported in this form when either --verbose is used OR if there is at least one -type of data requested that doesn't have a brief form such as any detail data or -ionodes, processes or slabs. Specifying some of the lustre output options with --lustopts -such as B, D and M will also force verbose format. - -<h3>Buddy (Memory Fragmentation) Data, <i>collectl -sb</i></h3> -<p> -<div class=terminal-wide14><pre> -# MEMORY FRAGMENTATION SUMMARY (4K pages) -# 1Pg 2Pgs 4Pgs 8Pgs 16Pgs 32Pgs 64Pgs 128Pgs 256Pgs 512Pgs 1024Pgs -</pre></div> - -This table shows the total number of memory fragments by pagesize in increasing powers of 2 for -all the memory types. -<p> -<p><h3>CPU, <i>collectl -sc</i></h3> - -<div class=terminal-wide14> -<pre> -# CPU SUMMARY (INTR, CTXSW & PROC /sec) -# User Nice Sys Wait IRQ Soft Steal Guest NiceG Idle CPUs Intr Ctxsw Proc RunQ Run Avg1 Avg5 Avg15 RunT BlkT -</pre> -</div> - -These are the percentage of time the system in running is one of the modes, noting that -these are averaged across all CPUs. While User and Sys modes are self-eplanitory, the others -may not be: -<p> -<table> -<tr valign=top><td><b>User</b></td> -<td>Time spent in User mode, not including time spend in "nice" mode.</td></tr> - -<tr valign=top><td><b>Nice</b></td> -<td>Time spent in Nice mode, that is lower priority as adjusted by -the nice command and have the "N" status flag set when examined with "ps".</td></tr> - -<tr valign=top><td><b>Sys</b></td> -<td>This is time spent in "pure" system time.</td></tr> - -<tr valign=top><td><b>Wait</b></td> -<td>Also known as "iowait", this is the time the CPU was idle during an -outstanding disk I/O request. This is not considered to be part of the total or -system times reported in brief mode.</td></tr> - -<tr valign=top><td><b>Irq</b></td> -<td>Time spent processing interrupts and also considered to be part of -the summary system time reported in "brief" mode.</td></tr> - -<tr valign=top><td><b>Soft</b></td> -<td>Time spent processing soft interrupts and also considered to be part -of the summary system time reported in "brief" mode.</td></tr> - -<tr valign=top><td><b>Steal</b></td> -<td>Time spent in other operating systems when running in a virtualized environment</td></tr> - -<tr valign=top><td><b>Guest</b></td> -<td>Time spent running a virtual CPU for guest operating systems under the control of the -Linux kernel, new since 2.6.24</td></tr> - -<tr valign=top><td><b>NiceG</b></td> -<td>Time spent running a niced guest (virtual CPU for guest operating systems under the -control of the Linux kernel), new since 2.6.33</td></tr> -</table> - -<p> -This next set of fields apply to processes -<p> -<table> -<tr><td><b>Proc</b></td><td>Process creations/sec.</li></td></tr> -<tr><td><b>Runq</b></td><td>Number of processes in the run queue.</li></td></tr> -<tr><td><b>Run</b></td><td>Number of processes in the run state.</li></td></tr> -<tr><td><b>Avg1, Avg5, Avg15</b></td><td>Load average over the last 1,5 and 15 minutes.</td></tr> -<tr><td><b>RunT</b></td><td>Total number of process in the run state, not counting collectl itself</td></tr> -<tr><td><b>BlkT</b></td><td>Total number of process blocked, waiting on I/O</td></tr> -</table> - -<p><h3>Disks, <i>collectl -sd</i></h3> -<p> -If you specify filtering with <i>--dskfilt</i>, the disks that match the pattern(s) -will either be included or excluded from the the summary data. However, the data will -<i>still</i> be collected so if recorded to a file can later be viewed. - -<div class=terminal-wide14> -<pre> -# DISK SUMMARY (/sec) -#KBRead RMerged Reads SizeKB KBWrit WMerged Writes SizeKB -</div></pre> - -<table> -<tr><td><b>KBRead</b></td><td>KB read/sec</td></tr> -<tr valign=top><td><b>RMerged</b></td><td>Read requests merged per second when being dequeued.</td></tr> -<tr><td><b>Reads</b></td><td>Number of reads/sec</td></tr> -<tr><td><b>SizeKB</b></td><td>Average read size in KB</td></tr> -<tr><td><b>KBWrite<b></td><td>KB written/sec</td></tr> -<tr valign=top><td><b>WMerged</b></td> -<td>Write requests merged per second when being dequeued.</tr></tr> -<tr><td><b>Writes</b></td><td>Number of writes/sec</td></tr> -<tr><td><b>SizeKB</b></td><td>Average write size in KB</td></tr> -</table> - -<p><h3>Inodes/Filesystem, <i>collectl -si</i></h3> - -<div class=terminal-wide14> -<pre> -# INODE SUMMARY -# Dentries File Handles Inodes -# Number Unused Alloc MaxPct Number - 40585 39442 576 0.17 38348 -</pre></div> - -<table> -<tr><td colspan=2>DCache</td></tr> -<tr><td><b>Dentries Number</b></td><td>Number of entries in directory cache</td</tr> -<tr><td><b>Dentried Unused</b></td><td>Number of unused entries in directory cache</td</tr> -<tr><td><b>Handles Alloc</b></td><td>Number of allocated file handles</td></tr> -<tr><td><b>handles % Max</b></td><td>Percentage of maximum available file handles</td></tr> -<tr><td><b>Inodes Number</b></td><td>Number of inodes in use</td></tr> -</table> - -<p><i>NOTE - as of this writing I'm baffled by the dentry unused field. No matter how -many files and/or directories I create, this number goes up! Sholdn't it go down?</i> - -<p><h3>Infiniband, <i>collectl -sx</i></h3> - -<div class=terminal-wide14> -<pre> -# INFINIBAND SUMMARY (/sec) -# KBIn PktIn SizeIn KBOut PktOut SizeOut Errors -</pre></div> -<table> -<tr><td><b>KBIn</b></td><td>KB received/sec.</td></tr> -<tr><td><b>PktIn</b></td><td>Packets received/sec.</td></tr> -<tr><td><b>SizeIn</b></td><td>Average incoming packet size in KB</td></tr> -<tr><td><b>KBOut</b></td><td>KB transmitted/sec.</td></tr> -<tr><td><b>PktOut</b></td><td>Packets transmitted/sec.</td></tr> -<tr><td><b>SizeOut</b></td><td>Average outgoing packet size in KB</td></tr> -<tr valign=top><td><b>Errs</b></td><td>Count of current errors. Since these -are typically infrequent, it is felt that reporting them as a rate would result -in either not seeing them OR round-off hiding their values.</td></tr> -</table> - -<p><h3>Lustre</h3> - -<p><b>Lustre Client</b>, <i>collectl -sl</i> -<p>There are several formats here controlled by the --lustopts switch. There is -also detail data for these available as well. Specifying -sL results in -data broken out by the file system and --lustopts O further breaks it out by OST. -Also note the average read/write sizes are only reported when --lustopts is <i>not</i> specified. - -<div class=terminal-wide14> -<pre> -# LUSTRE CLIENT SUMMARY -# KBRead Reads SizeKB KBWrite Writes SizeKB -</pre></div> - -<table> -<tr><td><b>KBRead</b></td><td>KB/sec delivered to the client.</td></tr> -<tr><td valign=top><b>Reads</b></td><td>Reads/sec delivered to the client, -not necessarily from the lustre storage servers.</td></tr> -<tr><td><b>SizeKB</b></td><td>Average read size in KB</td></tr> -<tr><td><b>KBWrite</b></td><td>KB Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>Writes</b></td><td>Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>SizeKB</b></td><td>Average write size in KB</td></tr> -</table> - -<div class=terminal-wide14> -<pre> -# LUSTRE CLIENT SUMMARY: METADATA -# KBRead Reads KBWrite Writes Open Close GAttr SAttr Seek Fsynk DrtHit DrtMis -</pre></div> - -<table> -<tr><td><b>KBRead</b></td><td>KB/sec delivered to the client.</td></tr> -<tr><td valign=top><b>Reads</b></td><td>Reads/sec delivered to the client, -not necessarily from the lustre storage servers.</td></tr> -<tr><td><b>KBWrite</b></td><td>KB Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>Writes</b></td><td>Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>Open</b></td><td>File opens/sec</td></tr> -<tr><td><b>Close</b></td><td>File closes/sec</td></tr> -<tr><td><b>GAttr</b></td><td>getattrs/sec</td></tr> -<tr><td><b>Seek</b></td><td>seeks/sec</td></tr> -<tr><td><b>Fsync</b></td><td>fsyncs/sec</td></tr> -<tr><td><b>DrtHit</b></td><td>dirty hits/sec</td></tr> -<tr><td><b>DrtMis</b></td><td>dirty misses/sec</td></tr> -</table> - -<div class=terminal-wide14> -<pre> -# LUSTRE CLIENT SUMMARY: READAHEAD -# KBRead Reads KBWrite Writes Pend Hits Misses NotCon MisWin FalGrb LckFal Discrd ZFile ZerWin RA2Eof HitMax Wrong -</pre></div> - -<table> -<tr><td><b>KBRead</b></td><td>KB/sec delivered to the client.</td></tr> -<tr><td valign=top><b>Reads</b></td><td>Reads/sec delivered to the client, -not necessarily from the lustre storage servers.</td></tr> -<tr><td><b>KBWrite</b></td><td>KB Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>Writes</b></td><td>Writes/sec delievered to the storage servers.</td></tr> -<tr><td><b>Pend</b></td><td>Pending issued pages</td></tr> -<tr><td><b>Hits</b></td><td>prefetch cache hits</td></tr> -<tr><td><b>Misses</b></td><td>prefetch cache misses</td></tr> -<tr><td><b>NotCon</b></td><td>The current pages read that were not consecutive with the previous ones./td></tr> -<tr><td><b>MisWin</b></td><td>Miss inside window. The pages that were expected to be in the - prefetch cache but weren't. They were probably - reclaimed due to memory pressure</td></tr> -<tr><td><b>LckFal</b></td><td>Failed grab_cache_pages. Tried to prefetch page but it was locked.</td></tr> -<tr><td><b>Discrd</b></td><td>Read but discarded. Prefetched pages (but not read by applicatin) - have been discarded either becuase of memory pressure or lock - revocation.</td></tr> -<tr><td><b>ZFile</b></td><td>Zero length file.</td></tr> -<tr><td><b>ZerWin</b></td><td>Zero size window.</td></tr> -<tr><td><b>RA2Eof</b></td><td>Read ahead to end of file</td></tr> -<tr><td><b>HitMax</b></td><td>Hit maximum readahead issue. The read-ahead window has grown to the - maximum specified by <i>max_read_ahead_mb</i></td></tr> -</table> - -<div class=terminal-wide14> -<pre> -# LUSTRE CLIENT SUMMARY: RPC-BUFFERS (pages) -#RdK Rds 1K 2K ... WrtK Wrts 1K 2K ... -</pre></div> - -This display shows the size of rpc buffer distribution buckets in K-pages. You can find the -page size for you system in the header (<i>collectl --showheader</i>). -<p> -<table> -<tr><td valign=top><b>RdK</b></td><td>KBs read/sec</td></tr> -<tr><td valign=top><b>Rds</b></td><td>Reads/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of pages of of this size read</td></tr> -<tr><td valign=top><b>WrtK</b></td><td>KBs written/sec</td></tr> -<tr><td valign=top><b>Wrts</b></td><td>Writes/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of pages of of this size written</td></tr> -</table> - -<p><b>Lustre Meta-Data Server</b>, <i>collectl -sl</i> -<p>As of Lustre 1.6.5, the data reported for the MDS had changed, breaking out the <i>Reint</i> -data into 5 individual buckets which are the last 5 fields described below. For earlier -versions those 5 fields will be replaced by a single one named <i>Reint</i>. - -<div class=terminal-wide14> -<pre> -# LUSTRE MDS SUMMARY -#Getattr GttrLck StatFS Sync Gxattr Sxattr Connect Disconn Create Link Setattr Rename Unlink -</pre></div> - -<table> -<tr><td valign=top><b>Getattr</b></td><td>Number of getattr calls, for example <i>lfs osts</i>. -Note that this counter is <i>not</i> incremented as the result of <i>ls</i> - see <i>Gxattr</i></td></tr> -<tr><td><b>GttrLck</b></td><td>These are getattrs that also return a lock on the file</td></tr> -<tr><td valign=top><b>StatFS</b></td><td>Number of stat calls, for example <i>df</i> or <i>lfs df</i>. -Note that lustre caches data for up to a second so many calls within a second may only show -up as a single <i>statfs</i></td></tr> -<tr><td><b>Sync</b></td><td>Number of sync calls</td></tr> -<tr><td valign=top><b>Gxattr</b></td><td>Extended attribute get operations, for example <i>getfattr</i>, -<i>getfacl</i> or even <i>ls.</i> Note that the MDS must have been mounted with <i>-o acl</i> -for this counter to be enabled.</td></tr> -<tr><td><b>Sxattr</b></td><td>Extended attribute set operations, for example <i>setfattr</i> or <i>setfacl</i></td></tr> -<tr><td><b>Connect</b></td><td>Client mount operations</td></tr> -<tr><td><b>Disconn</b></td><td>Client umount operations</td></tr> -<tr><td><b>Create</b></td><td>Count of mknod and mkdir operations, also used by NFS servers internally when creating files</td></tr> -<tr><td><b>Link</b></td><td>Hard and symbolic links, for example <i>ln</i></td></tr> -<tr><td><b>Setattr</b></td><td>All operations that modify inode attributes including chmod, chown, touch, etc</td></tr> -<tr><td><b>Rename</b></td><td>File and directory renames, for example <i>mv</i></td></tr> -<tr><td><b>Unlink</b></td><td>File/directory removals, for example <i>rm</i> or <i>rmdir</i></td></tr> -</table> -<p> -The following display is very similar the the RPC buffers in that the sizes of different size -I/O requests are reported. In this case there are requests sent to the disk driver. -Note that this report is only available for HP's SFS. - -<div class=terminal-wide14> -<pre> -# LUSTRE DISK BLOCK LEVEL SUMMARY -#Rds RdK 0.5K 1K ... Wrts WrtK 0.5K 1K ... -</pre></div> - -<table> -<tr><td valign=top><b>Rds</b></td><td>Reads/sec</td></tr> -<tr><td valign=top><b>RdK</b></td><td>KBs read/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of blocks of of this size read</td></tr> -<tr><td valign=top><b>Wrts</b></td><td>Writes/sec</td></tr> -<tr><td valign=top><b>WrtK</b></td><td>KBs written/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of blocks of of this size written</td></tr> -</table> - -<p><b>Lustre Object Storage Server</b>, <i>collectl -sl</i> -<div class=terminal-wide14> -<pre> -# LUSTRE OST SUMMARY -# KBRead Reads SizeKB KBWrite Writes SizeKB -</pre></div> - -<table> -<tr><td><b>KBRead</b></td><td>KB/sec read</td></tr> -<tr><td><b>Reads</b></td><td>Reads/sec</td></tr> -<tr><td><b>SizeKB</b></td><td>Average read size in KB</td></tr> -<tr><td><b>KBWrite</b></td><td>KB/sec written</td></tr> -<tr><td><b>Writes</b></td><td>Writes/sec</li> -<tr><td><b>SizeKB</b></td><td>Average write size in KB</td></tr> -</table> - -<p><b>Lustre Object Storage Server</b>, <i>collectl -sl --lustopts B</i> -<p> -As with client data, when you only get read/write average sizes when ---lustopt is <i>not</i> specified. -<div class=terminal-wide14> -<pre> -# LUSTRE OST SUMMARY -#<--------reads-----------|----writes----------------- -#RdK Rds 1K 2K ... WrtK Wrts 1K 2K .... -</pre></div> - -<table> -<tr><td valign=top><b>RdK</b></td><td>KBs read/sec</td></tr> -<tr><td valign=top><b>Rds</b></td><td>Reads/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of pages of of this size read</td></tr> -<tr><td valign=top><b>WrtK</b></td><td>KBs written/sec</td></tr> -<tr><td valign=top><b>Wrts</b></td><td>Writes/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of pages of of this size written</td></tr> -</table> - -<p><b>Lustre Object Storage Server</b>, <i>collectl -sl --lustopts D</i> - -<div class=terminal-wide14> -<pre> -# LUSTRE DISK BLOCK LEVEL SUMMARY -#RdK Rds 0.5K 1K ... WrtK Wrts 0.5K 1K ... -</pre></div> - -<table> -<tr><td valign=top><b>RdK</b></td><td>KBs read/sec</td></tr> -<tr><td valign=top><b>Rds</b></td><td>Reads/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of blocks of of this size read</td></tr> -<tr><td valign=top><b>WrtK</b></td><td>KBs written/sec</td></tr> -<tr><td valign=top><b>Wrts</b></td><td>Writes/sec</td></tr> -<tr><td valign=top><b>nK</b></td><td>Number of blocks of of this size written</td></tr> -</table> - -<p><h3>Memory, <i>collectl -sm</i></h3> - -<div class=terminal-wide14> -<pre> -# MEMORY SUMMARY -#<-------------------------------Physical Memory-------------------------------------><-----------Swap------------><-------Paging------> -# Total Used Free Buff Cached Slab Mapped Anon Commit Locked Inact Total Used Free In Out Fault MajFt In Out -</pre></div> - -<table> -<tr><td><b>Total</b></td> -<td>Total physical memory</td></tr> - -<tr valign=top><td><b>Used</b></td> -<td>Used physical memory. This does not include memory used by the kernel itself.</td></tr> - -<tr valign=top><td><b>Free</b></td> -<td>Unallocated memory</td></tr> - -<tr valign=top><td><b>Buff</b></td> -<td>Memory used for system buffers</td></tr> - -<tr valign=top><td><b>Cached</b></td> -<td>Memory used for caching data beween the kernel and disk, noting direct I/O does not use the cache</td></tr> - -<tr valign=top><td><b>Slab</b></td> -<td>Memory used for slabs, see <i>collectl -sY</i></td></tr> - -<tr valign=top><td><b>Mapped</b></td> -<td>Memory mapped by processes</td></tr> - -<tr valign=top><td><b>Anon</b></td> -<td>Anonymous memory. <i>NOTE - this </i>is included<i> with mapped memory in brief format</i></td></tr> - -<tr valign=top><td><b>Commit</b></td> -<td>According to RedHat: <i>"An estimate of how much RAM you would need to make a 99.99% guarantee -that there never is OOM (out of memory) for this workload."</i></td></tr> - -<tr valign=top><td><b>Locked</b></td> -<td>Locked Memory</td> - -<tr valign=top><td><b>Inactive</b></td> -<td>Inactive pages. On ealier kernels this number is the sum of the clean, dirty -and laundry pages.</td></tr> - -<tr><td><b>Swap Total</b></td> -<td>Total Swap</td></tr> - -<tr><td><b>Swap Used</b></td> -<td>Used Swap</td></tr> - -<tr><td><b>Swap Free</b></td> -<td>Free Swap</td></tr> - -<tr><td><b>Swap In</b></td> -<td>Kb swapped in/sec</td></tr> - -<tr><td><b>Swap Out</b></td> -<td>Kb swapped out/sec</td></tr> - -<tr><td><b>Fault</b></td> -<td>Page faults/sec resolved by not going to disk</td></tr> - -<tr><td><b>MajFt</b></td> -<td>These page faults are resolved by going to disk</td></tr> - -<tr><td><b>Paging In</b></td> -<td>Total number of pages read by block devices</td></tr> - -<tr><td><b>Paging Out</b></td> -<td>Total number of pages written by block devices</td></tr> -</table> -<p> -<center><b><i>Notes</i></b></center> -If you include <i>--memopts R</i>, memory and swap values wil be displayed as changes/sec between intervals -rather than absolute values in addition to page fault information, which is already displayed as rates. -This switch will also honor -on in that the values will not be normalized to a rate but rather displayed -as changes in size per interval. -<p> -If you include <i>--memopts</i> with P or V, collectl will only display Physical or Virtual memory. -The default is PV and will display both. - -<p><h3>Memory, <i>collectl -sm --memopts ps</i></h3> -<p> -The p and s options allow you to display data about page and/or steal and scan information. If you want this data combined with -the standard physical or virtual data you must explicitly request them as well. The columns show how the memory is allocated -for the respective sections. - -<div class=terminal-wide14> -<pre> -# MEMORY SUMMARY -#<---Other---|-------Page Alloc------|------Page Refill-----><------Page Steal-------|-------Scan KSwap------|------Scan Direct-----> -# Free Activ Dma Dma32 Norm Move Dma Dma32 Norm Move Dma Dma32 Norm Move Dma Dma32 Norm Move Dma Dma32 Norm Move - 14M 136K 2 69 13M 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -</pre></div> - -<p><h3>Network, <i>collectl -sn</i></h3> -<p> - -The entries for error counts in the following are actually the total of several -types of errors. To get individual error counts, you must either include <i>--netopts e</i> -or report details on individual interfaces in plot format by specifying -P. -Transmission errors are categorized by errors, dropped, fifo, collisions and carrier. -Receive errors are broken out for errors, dropped, fifo and framing errors. -<p> -If you specify filtering with <i>--netfilt</i>, the names that match the pattern(s) -will either be included or excluded from the the summary data. However, the data will -<i>still</i> be collected so if recorded to a file can later be viewed. - -<div class=terminal-wide14> -<pre> -# NETWORK SUMMARY (/sec) -# KBIn PktIn SizeIn MultI CmpI ErrsI KBOut PktOut SizeO CmpO ErrsO -</pre></div> - -<table> -<tr><td><b>KBIn</b></td> -<td>Incoming KB/sec</td></tr> - -<tr><td><b>PktIn</b></td> -<td>Incoming packets/sec</td></tr> - -<tr><td><b>SizeI</b></td> -<td>Average incoming packet size in bytes</td></tr> - -<tr><td><b>MultI</b></td> -<td>Incoming multicast packets/sec</td></tr> - -<tr><td><b>CmpI</b></td> -<td>Incoming compressed packets/sec</td></tr> - -<tr valign=top><td><b>ErrsI</b></td> -<td>Total incoming errors/sec. This is an aggregation of incoming error counters. To see explicit -error counters use <i>--netopts e</i></td></tr> - -<tr><td><b>KBOut</b></td> -<td>Outgoing KB/sec</td></tr> - -<tr><td><b>PktOut</b></td> -<td>Outgoing packets/sec</td></tr> - -<tr><td><b>SizeO</b></td> -<td>Average outgoing packet size in bytes</td></tr> - -<tr><td><b>CmpO</b></td> -<td>Outgoing compressed packets/sec</td></tr> - -<tr valign=top><td><b>ErrsO</b></td> -<td>Total outgoing errors/sec. This is an aggregation of outgoing error counters. To see explicit -error counters use <i>--netopts e</i> </td></tr> -</table> - -<p><h3>Network, <i>collectl -sn --netopts e</i></h3> -<p> -This alternative format, which is displayed when you specify <i>--netopts e</i> enumerates -the individual error types. You cannot see both output formats at the same time. - -<div class=terminal-wide14> -<pre> -# NETWORK ERRORS SUMMARY (/sec) -# ErrIn DropIn FifoIn FrameIn ErrOut DropOut FifoOut CollOut CarrOut -</pre></div> - -<table> -<tr><td><b>ErrIn</b></td> -<td>Receive errors/sec detected by the device driver</td></tr> -<tr><td><b>DropIn</b></td> -<td>Receive packets dropped/sec</td></tr> -<tr><td><b>FifoIn</b></td> -<td>Receive packet FIFO buffer errors/sec</td></tr> -<tr><td><b>FrameIn</b></td> -<td>Receive packet framing errors/sec</td></tr> -<tr><td><b>ErrOut</b></td> -<td>Transmit errors/sec detected by the device driver</td></tr> -<tr><td><b>DropOut</b></td> -<td>Transmit packets dropped/sec</td></tr> -<tr><td><b>FifoOut</b></td> -<td>Transmit packet FIFO buffer errors/sec</td></tr> -<tr><td><b>CollOut</b></td> -<td>Transmit collisions/sec detected on the interface</td></tr> -<tr><td><b>CarrOut</b></td> -<td>Transmit packet carrier loss errors detected/sec</td></tr> -</table> - -<p><h3>NFS, <i>collectl -sf</i></h3> -<p> -As of version 3.2.1, by default collectl collects and reports on all versions of nfs data, -both clients and servers. One can limit the types of data reported with <i>--nfsfilt</i> -and if only server or client data has been selected, only that type of data will be -reported as shown in the 2 forms below. When both server and client data are being -reported they will be displayed side by side. As with brief format, if filters have been -selected they will be displayed in the header. - -<div class=terminal-wide14> -<pre> -# NFS SUMMARY (/sec) -#<---------------------------server---------------------------> -# Reads Writes Meta Comm UDP TCP TCPConn BadAuth BadClnt -</pre></div> - -<table> -<tr><td><b>Reads</b></td><td>Total reads/sec</td></tr> -<tr><td><b>Writes</b></td><td>Total writes/sec</td></tr> -<tr><td><b>Meta</b></td><td>Total nfs meta data calls/sec, where meta data is -considered to be any of: lookup, access, getattr, setattr, readdir and readdirplus, -noting that not all types of nfs version report all as V3 clients/servers do.</td></tr> -<tr><td><b>Comm</b></td><td>Total commits/sec</td></tr> -<tr><td><b>UDP</b></td><td>Number of UDP packets/sec</td></tr> -<tr><td><b>TCP</b></td><td>Number of TCP packets/sec</td></tr> -<tr><td><b>TCPConn</b></td><td>Number of TCP connections/sec</td></tr> -<tr><td><b>BadAuth</b></td><td>Number of authentication failures/sec</td></tr> -<tr><td><b>BadClnt</b></td><td>Number of unknown clients/sec</td></tr> -</table> - -<div class=terminal-wide14> -<pre> -# NFS SUMMARY (/sec) -#<----------------client----------------> -# Reads Writes Meta Comm Retrans Authref -</pre></div> - -<table> -<tr><td><b>Reads</b></td><td>Total reads/sec</td></tr> -<tr><td><b>Writes</b></td><td>Total writes/sec</td></tr> -<tr><td><b>Meta</b></td><td>Total nfs meta data calls/sec, where meta data is -considered to be any of: lookup, access, getattr, setattr, readdir and readdirplus, -noting that not all types of nfs version report all as V3 clients/servers do.</td></tr> -<tr><td><b>Comm</b></td><td>Total commits/sec</td></tr> -<tr><td><b>Retrans</b></td><td>Number of retransmissions/sec</td></tr> -<tr><td><b>Authref</b></td><td>Number of authrefreshes/sec</td></tr> -</table - -<p><h3>NFS, <i>collectl -sf -nfsopts C</i></h3> -<p>The data reported for clients is slightly different, specifically the -retrans and authref fields. - -<div class=terminal-wide14> -<pre> -# NFS CLIENT (/sec) -#<----------RPC---------><---NFS V3---> -#CALLS RETRANS AUTHREF READ WRITE -</pre></div> - -<table> -<tr><td><b>Calls</b></td><td>Number of RPC calls/sec</td></tr> -<tr><td><b>Retrans</b></td><td>Retransmitted calls</td></tr> -<tr><td><b>Authref</b></td><td>Authentication failed</td></tr> -<tr><td><b>Read</b></td><td>Number of reads/sec</td></tr> -<tr><td><b>Write</b></td><td>Number of writes/sec</td></tr> -</table> - -<p><h3>Slabs, <i>collectl -sy</i></h3> -<p>As of the 2.6.22 kernel, there is a new slab allocator, called SLUB, and since -there is not a 1:1 mapping between what it reports and the older slab allocator, -the format of this listing will depend on which allocator is being used. The following -format is for the older allocator. - -<div class=terminal-wide14> -<pre> -# SLAB SUMMARY -#<------------Objects------------><--------Slab Allocation-------><--Caches---> -# InUse Bytes Alloc Bytes InUse Bytes Total Bytes InUse Total -</pre></div> - -<table> -<tr><td colspan=2>Objects</td></tr> -<tr valign=top><td><b>InUse</b></td> -<td>Total number of objects that are currently in use.</td></tr> -<tr valign=top><td><b>Bytes</b></td> -<td>Total size of all the objects in use.</td></tr> -<tr valign=top><td><b>Alloc</b></td> -<td>Total number of objects that have been allocated but not necessarily in use.</td></tr> -<tr valign=top><td><b>Bytes</b></td> -<td>Total size of all the allocated objects whether in use or not.</td></tr> - -<tr><td colspan=2>Slab Allocation</td></tr> -<tr valign=top><td><b>InUse</b></td> -<td>Number of slabs that have at least one active object in them.</td></tr> -<tr valign=top><td><b>Bytes</b></td> -<td>Total size of all the slabs.</td></tr> -<tr valign=top><td><b>Total</b></td> -<td>Total number of slabs that have been allocated whether in use or not.</td></tr> -<tr valign=top><td><b> Bytes</b></td> -<td>Total size of all the slabs that have been allocted whether in use or not.</td></tr> - -<tr><td colspan=2>Caches</td></tr> -<tr valign=top><td><b>InUse</b></td> -<td>Not all caches are actully in use. This included only those with non-zero -counts.</td></tr> -<tr valign=top><td><b>Total</b></td> -<td>This is the count of all caches, whether currently in use or not.</td></tr> -</table> - -<p>This is format for the new <i>slub</i> allocator - -<div class=terminal-wide14> -<pre> -# SLAB SUMMARY -#<---Objects---><-Slabs-><-----memory-----> -# In Use Avail Number Used Total -</pre></div> - -One should note that this report summarizes those slabs being monitored. In general -this represents all slabs, but if filering is being used these numbers will only -apply to those slabs that have matched the filter. -<p> -<table> -<tr><td colspan=2>Objects</td></tr> -<tr><td><b>InUse</b></td> -<td>The total number of objects that have been allocated to processes.</td></tr> -<tr valign=top><td><b>Avail</b></td> -<td>The total number of objects that are available in the currently allocated slabs. -This includes those that have already been allocated toprocesses.</td></tr> - -<tr><td colspan=2>Slabs</td></tr> -<tr valign=top><td><b>Number</b></td> -<td>This is the number of individual slabs that have been allocated and -taking physical memory.</td></tr> - -<tr><td colspan=2>Memory</td></tr> -<tr valign=top><td><b>Used</b></td> -<td>Used memory corresponds to those objects that have been allocated to -processes.</td></tr> - -<tr valign=top><td><b>Total</b></td> -<td>Total physical memory allocated to processes. When there is no filtering -in effect, this number will be equal to the Slabs field reported by -sm.</td></tr> -</table> - -<p><h3>Sockets, <i>collectl -ss</i></h3> - -<div class=terminal-wide14> -<pre> -# SOCKET STATISTICS -# <-------------Tcp-------------> Udp Raw <---Frag--> -#Used Inuse Orphan Tw Alloc Mem Inuse Inuse Inuse Mem -</pre></div> - -<table> -<tr><td valign=top><b>Used</b></td><td>Total number if socket allocated which can include additional types such as domain.</td></tr> -<tr><td colspan=2>Tcp</td></tr> -<tr><td><b>Inuse</td><td>Number of TCP connections in use</td></tr> -<tr><td><b>Orphan</td><td>Number of TCP orphaned connections</td></tr> -<tr><td><b>Tw</td><td>Number of connections in <i>TIME_WAIT</i></td></tr> -<tr><td><b>Alloc</td><td>TCP sockets allocated</td></tr> -<tr><td><b>Mem</td><td></td></tr> -<tr><td colspan=2>Udp</td></tr> -<tr><td><b>Inuse</td><td>Number of UCP connections in use</td></tr> -<tr><td colspan=2>Raw</td></tr> -<tr><td><b>Inuse</td><td>Number of RAW connections in use</td></tr> -<tr><td colspan=2>Frag</td></tr> -<tr><td><b>Inuse</td><td></td></tr> -<tr><td><b>Mem</td><td></td></tr> -</table> - -<p><h3>TCP, <i>collectl -st</i></h3> - -These are the counters one sees when running the command <i>netstat -s</i>, whose output is very verbose. Since this -format is an attemt to compress those field names to 6 characters or less, sometime something gets lost in the translation. - -As described in the <a href=Data-brief.html>brief</a> data formats, the actual TCP data displayed is based on the value of -<i>--tcpfilt</i> and like brief data, everything is displayed on a single line which can be quite wide, even more reason to -use this switch, espcially since the default format is over 200 columns wide! The following definitions are based the -value of that filter: - -<p><b>--tcpfilt i</b> -<div class=terminal-wide14> -<pre> -# TCP SUMMARY (/sec)# TCP STACK SUMMARY (/sec) -#<----------------------------------IpPkts-----------------------------------> -# Receiv Delivr Forwrd DiscdI InvAdd Sent DiscrO ReasRq ReasOK FragOK FragCr -</pre></div> - -<table> -<tr><td><b>Receiv</b><td></td><td>- total packets received/sec</td></tr> -<tr><td><b>Delivr</b><td></td><td>- incoming packets delivered/sec</td></tr> -<tr><td><b>Forwrd</b><td></td><td>- packets forwarded</td></tr> -<tr><td><b>DiscdI</b><td></td><td>- discarded incoming packets</td></tr> -<tr><td><b>InvAdd</b><td></td><td>- packets received with invalid addresses</td></tr> -<tr><td><b>Sent</b><td></td><td> - requests sent out/sec</td></tr> -<tr><td><b>DiscrO</b><td></td><td>- discarded outbound requests</td></tr> -<tr><td><b>ReasRq</b><td></td><td>- reassembled requests</td></tr> -<tr><td><b>ReasOK</b><td></td><td>- reassembled OK</td></tr> -<tr><td><b>FragOK</b><td></td><td>- fragments received OK</td></tr> -<tr><td><b>FragCr</b><td></td><td>- fragments created</td></tr> -</table> - -<p><b>--tcpfilt t</b> -<div class=terminal-wide14> -<pre> -# TCP SUMMARY (/sec)# TCP STACK SUMMARY (/sec) -#<---------------------------------Tcp---------------------------------> -# ActOpn PasOpn Failed ResetR Estab SegIn SegOut SegRtn SegBad SegRes -</pre></div> - -<table> -<tr><td><b>ActOpn</b></td><td>- active connections opened/sec</td></tr> -<tr><td><b>PasOpn</b></td><td>- passive connection opened/sec</td></tr> -<tr><td><b>Failed</b></td><td>- failed connection attempts</td></tr> -<tr><td><b>ResetR</b></td><td>- connection resets received</td></tr> -<tr><td><b>Estab</b></td><td> - connections established</td></tr> -<tr><td><b>SegIn</b></td><td> - segments received/sec</td></tr> -<tr><td><b>SegOut</b></td><td>- segments sent out/sec</td></tr> -<tr><td><b>SegRtn</b></td><td>- segments retransmitted</td></tr> -<tr><td><b>SegBad</b></td><td>- bad segments received</td></tr> -<tr><td><b>SegRes</b></td><td>- resets sent</td></tr> -</table> - -<p><b>--tcpfilt u</b> -<div class=terminal-wide14> -<pre> -# TCP SUMMARY (/sec)# TCP STACK SUMMARY (/sec) -#<------------Udp-----------> -# InDgm OutDgm NoPort Errors -</pre></div> - -<table> -<tr><td><b>InDgm</b></td><td>- packets received/sec</tr> -<tr><td><b>OutDgm</b></td><td>- packets sent/sec</tr> -<tr><td><b>NoPort</b></td><td>- packets received to unknown port</tr> -<tr><td><b>Errors</b></td><td>- packet receive errors</tr> -</table> - -<p><b>--tcpfilt c</b> -<div class=terminal-wide14> -<pre> -# TCP SUMMARY (/sec)# TCP STACK SUMMARY (/sec) -#<----------------------------Icmp---------------------------> -# Recvd FailI UnreI EchoI ReplI Trans FailO UnreO EchoO ReplO -</pre></div> - -<table> -<tr><td><b>Recvd</b></td><td>- ICMP messages received</td></tr> -<tr><td><b>FailI</b></td><td>- incoming ICMP messages failed</td></tr> -<tr><td><b>UnreI</b></td><td>- input destination unreachable</td></tr> -<tr><td><b>EchoI</b></td><td>- input echo requests</td></tr> -<tr><td><b>ReplI</b></td><td>- input echo reploes</td></tr> -<tr><td><b>Trans</b></td><td>- ICMP messages sent</td></tr> -<tr><td><b>FailO</b></td><td>- outbound ICMP messages failed</td></tr> -<tr><td><b>UnreO</b></td-><td>- output destination unreachable</td></tr> -<tr><td><b>EchoO</b></td><td> - output echo requests</td></tr> -<tr><td><b>ReplO</b></td><td> - output echo replies</td></tr> -</table> - -<p><b>--tcpfilt T</b> -<div class=terminal-wide14> -<pre> -# TCP SUMMARY (/sec)# TCP STACK SUMMARY (/sec) -#<-------------------------------------------------TcpExt------------------------------------------------> -# FasTim Reject DelAck QikAck PktQue PreQuB HdPdct PurAck HPAcks DsAcks RUData REClos SackS PkLoss FTrans -</pre></div> - -<table> -<tr><td><b>FasTim</b></td><td>- TCP sockets finished time wait in fast timer</td></tr> -<tr><td><b>Reject</b></td><td>- packet rejects in established connections because of timestamp</td></tr> -<tr><td><b>DelAck</b></td><td>- delayed ACKs sent</td></tr> -<tr><td><b>QikAck</b></td><td>- times quick ACK mode activated </td></tr> -<tr><td><b>PktQue</b></td><td>- packets directly queued to recvmsg prequeue</td></tr> -<tr><td><b>PreQuB</b></td><td>- bytes directly received in process context from prequeue</td></tr> -<tr><td><b>HdPdct</b></td><td>- packet headers predicted</td></tr> -<tr><td><b>PurAck</b></td><td>- acknowledgements for received packets not containing data, PureAcks in older versions </td></tr> -<tr><td><b>PurAck</b></td><td>- predicted acknowledgements</td></tr> -<tr><td><b>HPAcks</b></td><td>- DSACKS sent for old packets</td></tr> -<tr><td><b>RUData</b></td><td>- connections reset to do unexpected data</td></tr> -<tr><td><b>REClos</b></td><td>- connections reset due to early close</td></tr> -<tr><td><b>SackS</b></td><td>- SackShiftFallback</td></tr> -<tr><td><b>PkLoss</b></td><td>- Packet Loss</td></tr> -<tr><td><b>FTrans</b></td><td>- Fast Retransmission</td></tr> -</table> - -<table width=100%><tr><td align=right><i>updated Nov 02, 2016</i></td></tr></colgroup></table> - -<script type="text/javascript"> -var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); -document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -try { -var pageTracker = _gat._getTracker("UA-6408045-1"); -pageTracker._trackPageview(); -} catch(err) {}</script> - -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/docs/markseger,collectl(a)web.sourceforge.net new/collectl-4.3.1/docs/markseger,collectl(a)web.sourceforge.net --- old/collectl-4.3.0/docs/markseger,collectl(a)web.sourceforge.net 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/docs/markseger,collectl(a)web.sourceforge.net 1970-01-01 01:00:00.000000000 +0100 @@ -1,134 +0,0 @@ -<html> -<head> -<link rel=stylesheet href="style.css" type="text/css"> -<title>Exporting Data to Graphite</title> -</head> - -<body> -<center><h1>Exporting Data to Graphite</h1></center> -<p> -<h3>Introduction</h3> -<p> -With the release of Collectl Version 3.6.1, you can now send collectl data directly to <a href=http://graphite.wikidot.com> -graphite </a>. For existing collectl users this now provides you with yet another way to store/plot collectl data, whether on -a single system or hundreds. For graphite users who are not yet collectl users, you now have access to literally hundreds -of performance metrics: -<p> -<ul> -<li>Since all collectl instances collect this data at the same time, system noise on -clusters running fine-grained parallel jobs is reduced, though for larger clusters.</li> -<li>You can still log all the data collectl collects locally and only send a subset -to graphite, reducing the load on both graphite and your network.</li> -<li>You can monitor as infrequently as you like and send data to graphite at a -coarser frequency of either of the average, minimum or maximum values over that interval.</li> -<li>The r= switch, something unique to the graphite plugin, can help reduce the instantaneous -load on the graphite server itself.</li> -<li>All this at collectl's low monitoring overhead</li> -</ul> - -<h3>Usage</h3> -<p> -You use this export like any other, the only required option being the address to send the data to as in -the following example: - -<div class=terminal> -<pre> -collectl --export graphite,192.168.1.113 -</pre></div> - -However you should also note that since by design this export does not provide any terminal output, there -are only 2 real ways to make sure it is doing what you expect, the first being to inspect graphite's -whisper storage area for your particular host name and make sure the data you're collecting is in fact -showing up there: - -<div class=terminal> -<pre> -ls /opt/graphite/storage/whisper/poker -cpuload cputotals ctxint disktotals nettotals -</pre></div> - -or to simply run with the debug mask set to 1, which tells the graphite module to echo all the data it is -sending to graphite, noting in this case even though collectl is collecting cpu, disk and network data we're -not sending cpu data to graphite. This is something you might do if logging more data to disk than you are -sending to graphite, which in this case we are: - -<div class=terminal> -<pre> -collectl --export graphite,192.168.1.113,d=1,s=dn -rawtoo -f /var/log/collectl -poker.disktotals.reads 0 1325609789 -poker.disktotals.readkbs 0 1325609789 -poker.disktotals.writes 0 1325609789 -poker.disktotals.writekbs 0 1325609789 -poker.nettotals.kbin 0 1325609789 -poker.nettotals.pktin 1 1325609789 -poker.nettotals.kbout 0 1325609789 -poker.nettotals.pktout 0 1325609789 -</pre></div> - -<b><i>tip</i></b> - if you add 8 to the debug flag, eg <i>d=9</i>, this tells the graphite module not to -actually establish the connection with graphite's carbon listener but to only echo the data that would -have been sent. -<p> -Once you're happy with the switch settings, be sure to update the <i>DaemonCommands</i> in /etc/collectl.conf -and restart the collectl daemon to make them take effect. -<p> -<h3>Switches unique to graphite</h3> -<b>e=escape</b> -<br>When sending data to graphite, collectl prefaces each line item with the hostname. If that name includes -a domain name, extra <i>dots</i> add additional levels the the variable names which may not be desireable. By including -an escape character, those <i>dots</i> will be replaced by that character. -<p> -<b>r=seconds</b> -<br> -By design, collectl calls the export module as soon as the required data has been collected and collection -is synchronized to the nearest milli-seconds across a cluster, this means all instances of collectl will send -their data to graphite at almost exactly the same time. This high burst of data can overwhelm graphite and -so to reduce the load when that is found to be a problem, OR if you just want to smooth out the load you can -use <i>r=seconds</i> which literally means <i>delay sending your data to ganglia by a random number of micro-seconds -<= seconds</i>. -<p> -There is an additional caveat and that is that this stall must have completed by the end of the -current data collection periods and so you're restricted to a maximum delay of the interval less 1 second. -This means if you run collectl with -i1, you can't use -r. However, since most users run collectl with -intervals of 5 or 10 seconds, values of 4 or 9 should be more than sufficient. And if you choose a collection -interval of 30 seconds you may still want to use a value of r closer to 5 or 10 seconds so that the data will -arrive at graphite reasonablly close together. -<p> -For help with what other valid switches are, you can actually get the graphite module itself to tell -you like this: -<div class=terminal> -<pre> -collectl --export graphite,h -</pre></div> - -<h3>Communications</h3> -<p> -Collectl will attempt to establish a TCP connection to the specified address/port, noting the default port is 2003. -If that connection cannot be established, collectl will report an error but <i>not</i> exit! This is because -graphite itself may be down and need to be restarted. - -<div class=terminal> -<pre> -collectl --export graphite,192.168.1.113,d=1,s=dn -Could not create socket to 192.168.1.113:2003. Reason: Connection refused -</pre></div> - -By design when collectl assumes the graphite address is correct and will try to reconnect every monitoring -interval. Further, to avoid generating too many errors, it will silently continue to retry and only report -the connection failure every 100 times, a constant you can modify in the graphite.ph header if you really -care. Once graphite comes back online collectl will again start sending data to it. -<p> -<table width=100%><tr><td align=right><i>updated November 9, 2012</i></td></tr></colgroup></table> - -<script type="text/javascript"> -var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); -document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -try { -var pageTracker = _gat._getTracker("UA-6408045-1"); -pageTracker._trackPageview(); -} catch(err) {}</script> - -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/formatit.ph new/collectl-4.3.1/formatit.ph --- old/collectl-4.3.0/formatit.ph 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/formatit.ph 2018-11-01 14:47:48.000000000 +0100 @@ -5326,8 +5326,8 @@ my $i=$disks{$dskName}; $dskRecord=sprintf("%s$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS$SEP%$FS", $dskName, - $dskRead[$i]/$intSecs, $dskReadMrg[$i]/$intSecs, $dskReadKB[$i]/$intSecs, $dskWaitR[$i]/$intSecs, - $dskWrite[$i]/$intSecs, $dskWriteMrg[$i]/$intSecs, $dskWriteKB[$i]/$intSecs, $dskWaitW[$i]/$intSecs, + $dskRead[$i]/$intSecs, $dskReadMrg[$i]/$intSecs, $dskReadKB[$i]/$intSecs, $dskWaitR[$i], + $dskWrite[$i]/$intSecs, $dskWriteMrg[$i]/$intSecs, $dskWriteKB[$i]/$intSecs, $dskWaitW[$i], $dskRqst[$i], $dskQueLen[$i], $dskWait[$i], $dskSvcTime[$i], $dskUtil[$i]); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.3.0/vmsum.ph new/collectl-4.3.1/vmsum.ph --- old/collectl-4.3.0/vmsum.ph 2017-12-15 16:17:37.000000000 +0100 +++ new/collectl-4.3.1/vmsum.ph 2018-11-01 14:47:48.000000000 +0100 @@ -18,7 +18,7 @@ my $program='vmsum V1.0'; my %instances; my $oneMB=1024*1024; -my ($debug, $helpFlag, $versionFlag, $zeroFlag); +my ($debug, $helpFlag, $instMin, $versionFlag, $zeroFlag); my $Ssh= '/usr/bin/ssh'; my $Ping='/bin/ping'; @@ -78,6 +78,7 @@ # for now, if called via lexpr, we report data a different way! $lexprFlag=1 if $export=~/lexpr/; + $instMin=''; $startFlag=0; $uuidFlag=0; $debug=$helpFlag=$versionFlag=$zeroFlag=0; @@ -87,10 +88,11 @@ last if $option eq ''; my ($name, $value)=split(/=/, $option); - error2("valid options are: [adhsStuv]") if $name!~/^[adhsStuvz]$/; + error2("valid options are: [adhmsStuv]") if $name!~/^[adhmsStuvz]$/; $addrFlag=1 if $name eq 'a'; $debug=$value if $name eq 'd'; $helpFlag=1 if $name eq 'h'; + $instMin=$value if $name eq 'm'; $startFlag|=1 if $name eq 's'; $startFlag|=2 if $name eq 'S'; $textDir=$value if $name eq 't'; @@ -113,6 +115,7 @@ error2("--procopts s OR s/S flags but not both") if $startFlag && $procOpts=~/s/i; error2("t= only with lexpr") if $textDir ne '' && !$lexprFlag; error2("'$textDir' doesn't exist or is not a directory") if $textDir ne '' && (!-e $textDir || !-d $textDir); + error2("instance specified by -m must be exactly 8 chars") if $instMin ne '' && length($instMin) != 8; # set up some things in collectl itself (requires DEEP knowledge) setOutputFormat(); @@ -249,8 +252,9 @@ # we'll probably catch the full string in the next cycle (or two). also the command # itself looks different for qemu and kvm $cmd1=~/instance-(\w+)/; - my $instance=$1; - #print "INST: $instance\n"; + my $instance=(defined($1)) ? $1 : ''; + next if $instMin ne '' && $instance lt $instMin; + next if !defined($uuid) || !defined($instance); # only if no network problems, noting problems are rare, we need to find the index

1 0