X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fproc_diskstats.c;h=d48b8bf980ae45fbd9c73ef911e46ccaa41f28e4;hb=6372ed837298a34f6d16e0cde929822879863195;hp=d29e49734976e7bd695b138592740cade2af4d67;hpb=29a067a6d30ecf2acd9de3ee52c8f74610e014ad;p=netdata.git diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c index d29e4973..d48b8bf9 100755 --- a/src/proc_diskstats.c +++ b/src/proc_diskstats.c @@ -1,10 +1,13 @@ -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include #include #include +#include "common.h" #include "log.h" -#include "config.h" +#include "appconfig.h" #include "procfile.h" #include "rrd.h" #include "plugin_proc.h" @@ -16,23 +19,33 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { static procfile *ff = NULL; - + static char path_to_get_hw_sector_size[FILENAME_MAX + 1] = ""; static int enable_new_disks = -1; - static int do_io = -1, do_ops = -1, do_merged_ops = -1, do_iotime = -1, do_cur_ops = -1; + static int do_io = -1, do_ops = -1, do_mops = -1, do_iotime = -1, do_qops = -1, do_util = -1, do_backlog = -1; if(enable_new_disks == -1) enable_new_disks = config_get_boolean("plugin:proc:/proc/diskstats", "enable new disks detected at runtime", 1); - if(do_io == -1) do_io = config_get_boolean("plugin:proc:/proc/diskstats", "bandwidth for all disks", 1); - if(do_ops == -1) do_ops = config_get_boolean("plugin:proc:/proc/diskstats", "operations for all disks", 1); - if(do_merged_ops == -1) do_merged_ops = config_get_boolean("plugin:proc:/proc/diskstats", "merged operations for all disks", 1); - if(do_iotime == -1) do_iotime = config_get_boolean("plugin:proc:/proc/diskstats", "i/o time for all disks", 1); - if(do_cur_ops == -1) do_cur_ops = config_get_boolean("plugin:proc:/proc/diskstats", "current operations for all disks", 1); - - if(dt) {}; - - if(!ff) ff = procfile_open("/proc/diskstats", " \t"); + if(do_io == -1) do_io = config_get_boolean("plugin:proc:/proc/diskstats", "bandwidth for all disks", 1); + if(do_ops == -1) do_ops = config_get_boolean("plugin:proc:/proc/diskstats", "operations for all disks", 1); + if(do_mops == -1) do_mops = config_get_boolean("plugin:proc:/proc/diskstats", "merged operations for all disks", 1); + if(do_iotime == -1) do_iotime = config_get_boolean("plugin:proc:/proc/diskstats", "i/o time for all disks", 1); + if(do_qops == -1) do_qops = config_get_boolean("plugin:proc:/proc/diskstats", "queued operations for all disks", 1); + if(do_util == -1) do_util = config_get_boolean("plugin:proc:/proc/diskstats", "utilization percentage for all disks", 1); + if(do_backlog == -1)do_backlog = config_get_boolean("plugin:proc:/proc/diskstats", "backlog for all disks", 1); + + if(!ff) { + char filename[FILENAME_MAX + 1]; + snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/diskstats"); + ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT); + } if(!ff) return 1; + if(!path_to_get_hw_sector_size[0]) { + char filename[FILENAME_MAX + 1]; + snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/block/%s/queue/hw_sector_size"); + snprintf(path_to_get_hw_sector_size, FILENAME_MAX, "%s%s", global_host_prefix, config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", filename)); + } + ff = procfile_readall(ff); if(!ff) return 0; // we return 0, so that we will retry to open it next time @@ -42,9 +55,13 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { for(l = 0; l < lines ;l++) { char *disk; unsigned long long major = 0, minor = 0, - reads = 0, reads_merged = 0, readsectors = 0, readms = 0, - writes = 0, writes_merged = 0, writesectors = 0, writems = 0, - currentios = 0, iosms = 0, wiosms = 0; + reads = 0, mreads = 0, readsectors = 0, readms = 0, + writes = 0, mwrites = 0, writesectors = 0, writems = 0, + queued_ios = 0, busy_ms = 0, backlog_ms = 0; + + unsigned long long last_reads = 0, last_readsectors = 0, last_readms = 0, + last_writes = 0, last_writesectors = 0, last_writems = 0, + last_busy_ms = 0; words = procfile_linewords(ff, l); if(words < 14) continue; @@ -52,17 +69,46 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { major = strtoull(procfile_lineword(ff, l, 0), NULL, 10); minor = strtoull(procfile_lineword(ff, l, 1), NULL, 10); disk = procfile_lineword(ff, l, 2); - reads = strtoull(procfile_lineword(ff, l, 3), NULL, 10); - reads_merged = strtoull(procfile_lineword(ff, l, 4), NULL, 10); - readsectors = strtoull(procfile_lineword(ff, l, 5), NULL, 10); - readms = strtoull(procfile_lineword(ff, l, 6), NULL, 10); - writes = strtoull(procfile_lineword(ff, l, 7), NULL, 10); - writes_merged = strtoull(procfile_lineword(ff, l, 8), NULL, 10); - writesectors = strtoull(procfile_lineword(ff, l, 9), NULL, 10); - writems = strtoull(procfile_lineword(ff, l, 10), NULL, 10); - currentios = strtoull(procfile_lineword(ff, l, 11), NULL, 10); - iosms = strtoull(procfile_lineword(ff, l, 12), NULL, 10); - wiosms = strtoull(procfile_lineword(ff, l, 13), NULL, 10); + + // # of reads completed # of writes completed + // This is the total number of reads or writes completed successfully. + reads = strtoull(procfile_lineword(ff, l, 3), NULL, 10); // rd_ios + writes = strtoull(procfile_lineword(ff, l, 7), NULL, 10); // wr_ios + + // # of reads merged # of writes merged + // Reads and writes which are adjacent to each other may be merged for + // efficiency. Thus two 4K reads may become one 8K read before it is + // ultimately handed to the disk, and so it will be counted (and queued) + mreads = strtoull(procfile_lineword(ff, l, 4), NULL, 10); // rd_merges_or_rd_sec + mwrites = strtoull(procfile_lineword(ff, l, 8), NULL, 10); // wr_merges + + // # of sectors read # of sectors written + // This is the total number of sectors read or written successfully. + readsectors = strtoull(procfile_lineword(ff, l, 5), NULL, 10); // rd_sec_or_wr_ios + writesectors = strtoull(procfile_lineword(ff, l, 9), NULL, 10); // wr_sec + + // # of milliseconds spent reading # of milliseconds spent writing + // This is the total number of milliseconds spent by all reads or writes (as + // measured from __make_request() to end_that_request_last()). + readms = strtoull(procfile_lineword(ff, l, 6), NULL, 10); // rd_ticks_or_wr_sec + writems = strtoull(procfile_lineword(ff, l, 10), NULL, 10); // wr_ticks + + // # of I/Os currently in progress + // The only field that should go to zero. Incremented as requests are + // given to appropriate struct request_queue and decremented as they finish. + queued_ios = strtoull(procfile_lineword(ff, l, 11), NULL, 10); // ios_pgr + + // # of milliseconds spent doing I/Os + // This field increases so long as field queued_ios is nonzero. + busy_ms = strtoull(procfile_lineword(ff, l, 12), NULL, 10); // tot_ticks + + // weighted # of milliseconds spent doing I/Os + // This field is incremented at each I/O start, I/O completion, I/O + // merge, or read of these stats by the number of I/Os in progress + // (field queued_ios) times the number of milliseconds spent doing I/O since the + // last update of this field. This can provide an easy measure of both + // I/O completion time and the backlog that may be accumulating. + backlog_ms = strtoull(procfile_lineword(ff, l, 13), NULL, 10); // rq_ticks int def_enabled = 0; @@ -194,12 +240,12 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- + int sector_size = 512; if(do_io) { st = rrdset_find_bytype(RRD_TYPE_DISK, disk); if(!st) { char tf[FILENAME_MAX + 1], *t; char ssfilename[FILENAME_MAX + 1]; - int sector_size = 512; strncpy(tf, disk, FILENAME_MAX); tf[FILENAME_MAX] = '\0'; @@ -207,7 +253,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { // replace all / with ! while((t = strchr(tf, '/'))) *t = '!'; - snprintf(ssfilename, FILENAME_MAX, "/sys/block/%s/queue/hw_sector_size", tf); + snprintf(ssfilename, FILENAME_MAX, path_to_get_hw_sector_size, tf); FILE *fpss = fopen(ssfilename, "r"); if(fpss) { char ssbuffer[1025]; @@ -226,15 +272,15 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { } else error("Cannot read sector size for device %s from %s. Assuming 512.", disk, ssfilename); - st = rrdset_create(RRD_TYPE_DISK, disk, NULL, disk, "Disk I/O", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA); + st = rrdset_create(RRD_TYPE_DISK, disk, NULL, disk, "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA); rrddim_add(st, "reads", NULL, sector_size, 1024 * update_every, RRDDIM_INCREMENTAL); rrddim_add(st, "writes", NULL, sector_size * -1, 1024 * update_every, RRDDIM_INCREMENTAL); } - else rrdset_next(st); + else rrdset_next_usec(st, dt); - rrddim_set(st, "reads", readsectors); - rrddim_set(st, "writes", writesectors); + last_readsectors = rrddim_set(st, "reads", readsectors); + last_writesectors = rrddim_set(st, "writes", writesectors); rrdset_done(st); } @@ -243,34 +289,82 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { if(do_ops) { st = rrdset_find_bytype("disk_ops", disk); if(!st) { - st = rrdset_create("disk_ops", disk, NULL, disk, "Disk Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE); + st = rrdset_create("disk_ops", disk, NULL, disk, "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; rrddim_add(st, "reads", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); rrddim_add(st, "writes", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); } - else rrdset_next(st); + else rrdset_next_usec(st, dt); - rrddim_set(st, "reads", reads); - rrddim_set(st, "writes", writes); + last_reads = rrddim_set(st, "reads", reads); + last_writes = rrddim_set(st, "writes", writes); rrdset_done(st); } - + // -------------------------------------------------------------------- - if(do_merged_ops) { - st = rrdset_find_bytype("disk_merged_ops", disk); + if(do_qops) { + st = rrdset_find_bytype("disk_qops", disk); if(!st) { - st = rrdset_create("disk_merged_ops", disk, NULL, disk, "Merged Disk Operations", "operations/s", 2010, update_every, RRDSET_TYPE_LINE); + st = rrdset_create("disk_qops", disk, NULL, disk, "Disk Queued I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE); + st->isdetail = 1; + + rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE); + } + else rrdset_next_usec(st, dt); + + rrddim_set(st, "operations", queued_ios); + rrdset_done(st); + } + + // -------------------------------------------------------------------- + + if(do_backlog) { + st = rrdset_find_bytype("disk_backlog", disk); + if(!st) { + st = rrdset_create("disk_backlog", disk, NULL, disk, "Disk Backlog", "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA); + st->isdetail = 1; + + rrddim_add(st, "backlog", NULL, 1, 10 * update_every, RRDDIM_INCREMENTAL); + } + else rrdset_next_usec(st, dt); + + rrddim_set(st, "backlog", backlog_ms); + rrdset_done(st); + } + + // -------------------------------------------------------------------- + + if(do_util) { + st = rrdset_find_bytype("disk_util", disk); + if(!st) { + st = rrdset_create("disk_util", disk, NULL, disk, "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA); + st->isdetail = 1; + + rrddim_add(st, "utilization", NULL, 1, 10 * update_every, RRDDIM_INCREMENTAL); + } + else rrdset_next_usec(st, dt); + + last_busy_ms = rrddim_set(st, "utilization", busy_ms); + rrdset_done(st); + } + + // -------------------------------------------------------------------- + + if(do_mops) { + st = rrdset_find_bytype("disk_mops", disk); + if(!st) { + st = rrdset_create("disk_mops", disk, NULL, disk, "Disk Merged Operations", "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; rrddim_add(st, "reads", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); rrddim_add(st, "writes", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); } - else rrdset_next(st); + else rrdset_next_usec(st, dt); - rrddim_set(st, "reads", reads_merged); - rrddim_set(st, "writes", writes_merged); + rrddim_set(st, "reads", mreads); + rrddim_set(st, "writes", mwrites); rrdset_done(st); } @@ -279,37 +373,69 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { if(do_iotime) { st = rrdset_find_bytype("disk_iotime", disk); if(!st) { - st = rrdset_create("disk_iotime", disk, NULL, disk, "Disk I/O Time", "milliseconds/s", 2005, update_every, RRDSET_TYPE_LINE); + st = rrdset_create("disk_iotime", disk, NULL, disk, "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; rrddim_add(st, "reads", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); rrddim_add(st, "writes", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "latency", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "weighted", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); } - else rrdset_next(st); + else rrdset_next_usec(st, dt); - rrddim_set(st, "reads", readms); - rrddim_set(st, "writes", writems); - rrddim_set(st, "latency", iosms); - rrddim_set(st, "weighted", wiosms); + last_readms = rrddim_set(st, "reads", readms); + last_writems = rrddim_set(st, "writes", writems); rrdset_done(st); } // -------------------------------------------------------------------- + // calculate differential charts + // only if this is not the first time we run + + if(dt) { + if(do_iotime && do_ops) { + st = rrdset_find_bytype("disk_await", disk); + if(!st) { + st = rrdset_create("disk_await", disk, NULL, disk, "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE); + st->isdetail = 1; + + rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ABSOLUTE); + rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ABSOLUTE); + } + else rrdset_next_usec(st, dt); - if(do_cur_ops) { - st = rrdset_find_bytype("disk_cur_ops", disk); - if(!st) { - st = rrdset_create("disk_cur_ops", disk, NULL, disk, "Current Disk I/O operations", "operations", 2004, update_every, RRDSET_TYPE_LINE); - st->isdetail = 1; + rrddim_set(st, "reads", (reads - last_reads) ? (readms - last_readms) / (reads - last_reads) : 0); + rrddim_set(st, "writes", (writes - last_writes) ? (writems - last_writems) / (writes - last_writes) : 0); + rrdset_done(st); + } - rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE); + if(do_io && do_ops) { + st = rrdset_find_bytype("disk_avgsz", disk); + if(!st) { + st = rrdset_create("disk_avgsz", disk, NULL, disk, "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA); + st->isdetail = 1; + + rrddim_add(st, "reads", NULL, sector_size, 1024, RRDDIM_ABSOLUTE); + rrddim_add(st, "writes", NULL, -sector_size, 1024, RRDDIM_ABSOLUTE); + } + else rrdset_next_usec(st, dt); + + rrddim_set(st, "reads", (reads - last_reads) ? (readsectors - last_readsectors) / (reads - last_reads) : 0); + rrddim_set(st, "writes", (writes - last_writes) ? (writesectors - last_writesectors) / (writes - last_writes) : 0); + rrdset_done(st); } - else rrdset_next(st); - rrddim_set(st, "operations", currentios); - rrdset_done(st); + if(do_util && do_ops) { + st = rrdset_find_bytype("disk_svctm", disk); + if(!st) { + st = rrdset_create("disk_svctm", disk, NULL, disk, "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE); + st->isdetail = 1; + + rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ABSOLUTE); + } + else rrdset_next_usec(st, dt); + + rrddim_set(st, "svctm", ((reads - last_reads) + (writes - last_writes)) ? (busy_ms - last_busy_ms) / ((reads - last_reads) + (writes - last_writes)) : 0); + rrdset_done(st); + } } }