22b10e5b01
Resolves: rhbz#1994220 - vdo_stats: Default to 100 % savings for invalid savings values Resolves: rhbz#2025880 - Add support for creating and unlocking standalone integrity devices Resolves: rhbz#2011365
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
From 940346f14ee5644f2593817b4196c18de8a713f0 Mon Sep 17 00:00:00 2001
|
|
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
Date: Mon, 22 Nov 2021 14:16:02 +0100
|
|
Subject: [PATCH] vdo_stats: Default to 100 % savings for invalid savings
|
|
values
|
|
|
|
We are currently using "-1" when VDO logical_blocks_used is 0
|
|
which doesn't match the LVM logic which returns 100 so to make
|
|
both values in vdo_info and vdo_stats equal we should return 100
|
|
in this case too.
|
|
---
|
|
src/plugins/vdo_stats.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/vdo_stats.c b/src/plugins/vdo_stats.c
|
|
index 3ec2d60..f3f0390 100644
|
|
--- a/src/plugins/vdo_stats.c
|
|
+++ b/src/plugins/vdo_stats.c
|
|
@@ -96,7 +96,7 @@ static void add_block_stats (GHashTable *stats) {
|
|
g_hash_table_replace (stats, g_strdup ("oneKBlocksUsed"), g_strdup_printf ("%"G_GINT64_FORMAT, (data_blocks_used + overhead_blocks_used) * block_size / 1024));
|
|
g_hash_table_replace (stats, g_strdup ("oneKBlocksAvailable"), g_strdup_printf ("%"G_GINT64_FORMAT, (physical_blocks - data_blocks_used - overhead_blocks_used) * block_size / 1024));
|
|
g_hash_table_replace (stats, g_strdup ("usedPercent"), g_strdup_printf ("%.0f", 100.0 * (gfloat) (data_blocks_used + overhead_blocks_used) / (gfloat) physical_blocks + 0.5));
|
|
- savings = (logical_blocks_used > 0) ? (gint64) (100.0 * (gfloat) (logical_blocks_used - data_blocks_used) / (gfloat) logical_blocks_used) : -1;
|
|
+ savings = (logical_blocks_used > 0) ? (gint64) (100.0 * (gfloat) (logical_blocks_used - data_blocks_used) / (gfloat) logical_blocks_used) : 100;
|
|
g_hash_table_replace (stats, g_strdup ("savings"), g_strdup_printf ("%"G_GINT64_FORMAT, savings));
|
|
if (savings >= 0)
|
|
g_hash_table_replace (stats, g_strdup ("savingPercent"), g_strdup_printf ("%"G_GINT64_FORMAT, savings));
|
|
--
|
|
2.31.1
|
|
|