Skip to content

Commit

Permalink
Merge branch 'qa-test-fixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
@natoscott
natoscott committed Sep 1, 2023
2 parents 5333a23 + 6602e7b commit ae0696b
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 84 deletions.
4 changes: 2 additions & 2 deletions qa/1163.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5840,7 +5840,7 @@ Other values encode various degrees of PMDA difficulty in three bit fields

bits 7..0
1 the PMDA is connected, but not yet "ready" to accept requests
from PMCD
from the PMDA
2 the PMDA has exited of its own accord
4 some error prevented the PMDA being started
8 PMCD stopped communication with the PMDA due to a protocol or
Expand Down Expand Up @@ -7040,7 +7040,7 @@ Other values encode various degrees of PMDA difficulty in three bit fields

bits 7..0
1 the PMDA is connected, but not yet "ready" to accept requests
from PMCD
from the PMDA
2 the PMDA has exited of its own accord
4 some error prevented the PMDA being started
8 PMCD stopped communication with the PMDA due to a protocol or
Expand Down
22 changes: 11 additions & 11 deletions src/pcp/netstat/pcp-netstat.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,26 @@ By default
reports live data for the local host. It has the capabilities to analyze the data on the archives as well.
.SH OPTIONS
.TP
\fB\-\-statistics\fP
\fB\-\-statistics\fR
shows output similar to netstat -s, which displays summary statistics for each protocol
.TP
\fB\-i\fP
\fB\-i\fR
shows output similar to netstat -i -a -n, which displays a table of all network interfaces
.TP
\fB\-p\fP, \fB\-\-TCP|IP|UDP|ICMP\fP
\fB\-p\fR, \fB\-\-TCP|IP|UDP|ICMP\fR
filter network statistics specific to a protocol
.TP
\fB\-a\fP, \fB\-\-archive\fP
Fetch /proc/netstat for a specified archive file
\fB\-a\fR \fIfile\fR, \fB\-\-archive\fR=\fIfile\fR
Fetch /proc/netstat for a specified archive \fIfile\fR
.TP
\fB\-s\fP, \fB\-\-samples\fP
Get the network statistics for specified number of samples count
\fB\-s\fR \fIcount\fR, \fB\-\-samples\fR=\fIcount\fR
Get the network statistics for specified number of samples \fIcount\fR
.TP
\fB\-S\fP, \fB\-\-START TIME\fP
Filter the samples from the archive from the given time
\fB\-S\fR, \fB\-\-start\fR=\fItime\fR
Filter the samples from the archive from the given \fItime\fR
.TP
\fB\-T\fP, \fB\-\-END TIME\fP
Filter the samples from the archive till the given time
\fB\-T\fR, \fB\-\-finish=time\fR
Filter the samples from the archive until the given \fItime\fR
.TP
\fB\-V\fR, \fB\-\-version\fR
Display version number and exit.
Expand Down
158 changes: 87 additions & 71 deletions src/pcp/zoneinfo/pcp-zoneinfo.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
[\f3\-a\f1 \f2archive\f1]
[\f3\-S\f1 \f2start_time\f1]
[\f3\-T\f1 \f2end_time\f1]
[\f3\-Z\f1 \f2timezone\f1]
.SH DESCRIPTION
The
.B pcp-zoneinfo
Expand All @@ -43,91 +44,106 @@ l lx.
HEADER DESCRIPTION
_ _

.B Per node stats
.B Per node stats (for each zone for each NUMA node)

nr_inactive_anon zone inactive anonymous pages for each zone for each NUMA node
nr_active_anon number of active anonymous memory pages in each zone for each NUMA node
nr_inactive_file number of inactive file memory pages in each zone for each NUMA node
nr_active_file number of active file memory memory pages in each zone for each NUMA node
nr_unevictable number of unevictable pages in each zone for each NUMA node
nr_slab_reclaimable number of reclaimable slab pages in each zone for each NUMA node
nr_slab_unreclaimable number of unreclaimable slab pages in each zone for each NUMA node
nr_isolated_anon number of isolated anonymous memory pages in each zone for each NUMA node
nr_isolated_file number of isolated file memory pages in each zone for each NUMA node
nr_anon_pages number of anonymous mapped pagecache pages in each zone for each NUMA node
nr_mapped number of mapped pagecache pages in each zone for each NUMA node
nr_file_pages number of file pagecache pages in each zone for each NUMA node
nr_dirty number of pages dirty state in each zone for each NUMA node
nr_writeback number of pages writeback state in each zone for each NUMA node
nr_writeback_temp number of temporary writeback pages in each zone for each NUMA node
nr_shmem number of shared memory pages in each zone for each NUMA node
nr_shmem_hugepages shared memory huge pages in each zone for each NUMA node
nr_shmem_pmdmapped shared memory PMD mappings in each zone for each NUMA node
nr_file_hugepages file-backed huge pages in each zone for each NUMA node
nr_file_pmdmapped file-backed PMD mappings in each zone for each NUMA node
nr_anon_transparent_hugepages number of anonymous transparent huge pages in each zone for each NUMA node
nr_unstable number of pages unstable state in each zone for each NUMA node
nr_vmscan_write Count of pages written from the LRU by the VM scanner in each zone
for each NUMA node.The VM is supposed to minimise the number of
pages which get written from the LRU (for IO scheduling efficiency,
and for high reclaim-success rates).
nr_vmscan_immediate_reclaim prioritise for reclaim when writeback ends in each zone for each NUMA node
nr_dirtied count of pages entering dirty state in each zone for each NUMA node
nr_written count of pages written out in each zone for each NUMA node
nr_kernel_misc_reclaimable miscellaneous reclaimable kernel pages in each zone for each NUMA node
nr_inactive_anon zone inactive anonymous pages
nr_active_anon active anonymous memory pages
nr_inactive_file inactive file memory pages
nr_active_file active file memory memory pages
nr_unevictable unevictable pages
nr_slab_reclaimable reclaimable slab pages
nr_slab_unreclaimable unreclaimable slab pages
nr_isolated_anon isolated anonymous memory pages
nr_isolated_file isolated file memory pages
nr_anon_pages anonymous mapped pagecache pages
nr_mapped mapped pagecache pages
nr_file_pages file pagecache pages
nr_dirty pages dirty state
nr_writeback pages writeback state
nr_writeback_temp temporary writeback pages
nr_shmem shared memory pages
nr_shmem_hugepages shared memory huge pages
nr_shmem_pmdmapped shared memory PMD mappings
nr_file_hugepages file-backed huge pages
nr_file_pmdmapped file-backed PMD mappings
nr_anon_transparent_hugepages anonymous transparent huge pages
nr_unstable pages in unstable state in each zone
nr_vmscan_write pages written from the LRU by the VM scanner
The VM is supposed to minimise the number of
pages which get written from the LRU (for IO
scheduling efficiency and reclaim success).
nr_vmscan_immediate_reclaim prioritise for reclaim when writeback ends
nr_dirtied pages entering dirty state
nr_written pages written out in each zone
nr_kernel_misc_reclaimable miscellaneous reclaimable kernel pages

.B Per zone stats
.B Per zone stats (in each zone for each NUMA node)

pages free free space in each zone for each NUMA node
min min space in each zone for each NUMA node
low low space in each zone for each NUMA node
high high space in each zone for each NUMA node
spanned spanned space in each zone for each NUMA node
present present space in each zone for each NUMA node
managed managed space in each zone for each NUMA node
protection protection space in each zone for each NUMA node
nr_free_pages number of free pages in each zone for each NUMA node.
nr_zone_inactive_anon zone inactive anonymous pages for each zone for each NUMA node
nr_zone_active_anon zone active anonymous pages for each zone for each NUMA node
nr_zone_inactive_file zone inactive file-backed pages for each zone for each NUMA node
nr_zone_active_file zone active file-backed pages for each zone for each NUMA node
nr_zone_unevictable zone unevictable pages for each zone for each NUMA node
nr_zone_write_pending zone write-pending pages for each zone for each NUMA node
nr_mlock number of pages under mlock in each zone for each NUMA node
nr_page_table_pages number of page table pages in each zone for each NUMA node
nr_kernel_stack number of pages of kernel stack in each zone for each NUMA node
nr_bounce number of bounce buffer pages in each zone for each NUMA node
nr_zspages count of zsmalloc memory allocator pages for each zone for each NUMA node
nr_free_cma count of free Contiguous Memory Allocator pages in each zone for each NUMA node
numa_hit Count of successful allocations from preferred NUMA zone in each zone
for each NUMA node.
numa_miss Count of unsuccessful allocations from preferred NUMA zone in each zone
for each NUMA node.
numa_foreign Count of foreign NUMA zone allocations in each zone for each NUMA node.
numa_interleave count of interleaved NUMA allocations in each zone for each NUMA node
numa_local Count of successful allocations from local NUMA zone in each zone for
each NUMA node.
numa_other Count of unsuccessful allocations from local NUMA zone in each zone for
each NUMA node.
pages free free space
min min space
low low space
high high space
spanned spanned space
present present space
managed managed space
protection protection space
nr_free_pages number of free pages
nr_zone_inactive_anon zone inactive anonymous pages
nr_zone_active_anon zone active anonymous pages
nr_zone_inactive_file zone inactive file-backed pages
nr_zone_active_file zone active file-backed pages
nr_zone_unevictable zone unevictable pages
nr_zone_write_pending zone write-pending pages
nr_mlock pages under mlock
nr_page_table_pages page table pages
nr_kernel_stack pages of kernel stack
nr_bounce bounce buffer pages
nr_zspages zsmalloc memory allocator pages
nr_free_cma free Contiguous Memory Allocator pages
numa_hit successful allocations in preferred NUMA zone
numa_miss unsuccessful allocations in xpreferred NUMA zone
numa_foreign foreign NUMA zone allocations
numa_interleave interleaved NUMA allocations
numa_local successful allocations from local NUMA zone
numa_other unsuccessful allocations from local NUMA zone
.TE

.SH OPTIONS
.TP
\fB\-a\fP, \fB\-\-archive\fP
Fetch /proc/zoneinfo for a specified archive file
\fB\-a\fR \fIfile\fR, \fB\-\-archive\fR=\fIfile\fR
Fetch /proc/zoneinfo for a specified archive \fIfile\fR
.TP
\fB\-s\fP, \fB\-\-samples\fP
Get the zoneinfo for specified number of samples count
\fB\-s\fR \fIcount\fR, \fB\-\-samples\fR=\fIcount\fR
Get the zoneinfo statistics for specified number of samples \fIcount\fR
.TP
\fB\-S\fP, \fB\-\-START TIME\fP
Filter the samples from the archive from the given time
\fB\-S\fR, \fB\-\-start\fR=\fItime\fR
Filter the samples from the archive from the given \fItime\fR
.TP
\fB\-T\fP, \fB\-\-END TIME\fP
Filter the samples from the archive till the given time
\fB\-T\fR, \fB\-\-finish=time\fR
Filter the samples from the archive until the given \fItime\fR
.TP
\fB\-V\fR, \fB\-\-version\fR
Display version number and exit.
.TP
\fB\-z\fR, \fB\-\-hostzone\fR
Use the local timezone of the host that is the source of the
performance metrics, as identified by either the
.B \-h
or the
.B \-a
options.
The default is to use the timezone of the local host.
.TP
\fB\-Z\fR \fItimezone\fR, \fB\-\-timezone\fR=\fItimezone\fR
Use
.I timezone
for the date and time.
.I Timezone
is in the format of the environment variable
.B TZ
as described in
.BR environ (7).
.TP
\fB\-?\fR, \fB\-\-help\fR
Display usage message and exit.
.SH NOTES
Expand Down

0 comments on commit ae0696b

Please sign in to comment.