Merging upstream version 1.19.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 4 deletions

diff --git a/database/engine/rrdenginelib.c b/database/engine/rrdenginelib.c
index 1a04dc2a4..0606dd938 100644
--- a/database/engine/rrdenginelib.c
+++ b/database/engine/rrdenginelib.c
@@ -131,7 +131,7 @@ char *get_rrdeng_statistics(struct rrdengine_instance *ctx, char *str, size_t si
               "page_cache_total_pages: %ld\n"
               "page_cache_descriptors: %ld\n"
               "page_cache_populated_pages: %ld\n"
-              "page_cache_commited_pages: %ld\n"
+              "page_cache_committed_pages: %ld\n"
               "page_cache_insertions: %ld\n"
               "page_cache_deletions: %ld\n"
               "page_cache_hits: %ld\n"
@@ -153,13 +153,20 @@ char *get_rrdeng_statistics(struct rrdengine_instance *ctx, char *str, size_t si
               "datafile_creations: %ld\n"
               "datafile_deletions: %ld\n"
               "journalfile_creations: %ld\n"
-              "journalfile_deletions: %ld\n",
+              "journalfile_deletions: %ld\n"
+              "io_errors: %ld\n"
+              "fs_errors: %ld\n"
+              "global_io_errors: %ld\n"
+              "global_fs_errors: %ld\n"
+              "rrdeng_reserved_file_descriptors: %ld\n"
+              "flushing_errors: %ld\n"
+              "global_flushing_errors: %ld\n",
               (long)ctx->stats.metric_API_producers,
               (long)ctx->stats.metric_API_consumers,
               (long)pg_cache->page_descriptors,
               (long)ctx->stats.page_cache_descriptors,
               (long)pg_cache->populated_pages,
-              (long)pg_cache->commited_page_index.nr_commited_pages,
+              (long)pg_cache->committed_page_index.nr_committed_pages,
               (long)ctx->stats.pg_cache_insertions,
               (long)ctx->stats.pg_cache_deletions,
               (long)ctx->stats.pg_cache_hits,
@@ -181,7 +188,14 @@ char *get_rrdeng_statistics(struct rrdengine_instance *ctx, char *str, size_t si
               (long)ctx->stats.datafile_creations,
               (long)ctx->stats.datafile_deletions,
               (long)ctx->stats.journalfile_creations,
-              (long)ctx->stats.journalfile_deletions
+              (long)ctx->stats.journalfile_deletions,
+              (long)ctx->stats.io_errors,
+              (long)ctx->stats.fs_errors,
+              (long)global_io_errors,
+              (long)global_fs_errors,
+              (long)rrdeng_reserved_file_descriptors,
+              (long)ctx->stats.flushing_errors,
+              (long)global_flushing_errors
     );
     return str;
 }