diff --git a/Anvil/Tools/Cluster.pm b/Anvil/Tools/Cluster.pm
index 67bdae14..d676f804 100644
--- a/Anvil/Tools/Cluster.pm
+++ b/Anvil/Tools/Cluster.pm
@@ -427,12 +427,15 @@ ORDER BY
{
# If there are two or three VGs, we can create a group.
my $count = keys %{$anvil->data->{ungrouped_vgs}{$scan_lvm_vg_size}{host_uuid}};
- $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { count => $count }});
+ $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
+ scan_lvm_vg_size => $scan_lvm_vg_size." (".$anvil->Convert->bytes_to_human_readable({'bytes' => $scan_lvm_vg_size}).")",
+ count => $count,
+ }});
if (($count == 2) or ($count == 3))
{
# Create the volume group ... group. First we need a group number
my $storage_group_uuid = $anvil->Database->insert_or_update_storage_groups({
- debug => $debug,
+ debug => 2,
storage_group_anvil_uuid => $anvil_uuid,
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { storage_group_uuid => $storage_group_uuid }});
@@ -448,7 +451,7 @@ ORDER BY
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { storage_group_member_vg_uuid => $storage_group_member_vg_uuid }});
my $storage_group_member_uuid = $anvil->Database->insert_or_update_storage_group_members({
- debug => $debug,
+ debug => 2,
storage_group_member_storage_group_uuid => $storage_group_uuid,
storage_group_member_host_uuid => $host_uuid,
storage_group_member_vg_uuid => $storage_group_member_vg_uuid,
@@ -461,6 +464,9 @@ ORDER BY
}});
}
+ # Delete this so we don't keel creating new Storage groups.
+ delete $anvil->data->{ungrouped_vgs}{$scan_lvm_vg_size};
+
# Reload storage group data
$reload_storage_groups = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { reload_storage_groups => $reload_storage_groups }});
diff --git a/cgi-bin/get_replicated_storage b/cgi-bin/get_replicated_storage
index dc7037ee..160e2566 100755
--- a/cgi-bin/get_replicated_storage
+++ b/cgi-bin/get_replicated_storage
@@ -82,6 +82,7 @@ else
$anvil->data->{raw}{newest_record}{$dr1_uuid} = 0;
}
+ $hash->{total_resync_rate} = 0;
foreach my $host_uuid (@hosts)
{
my $host_name = $anvil->Get->host_name_from_uuid({host_uuid => $host_uuid});
@@ -266,6 +267,10 @@ WHERE
}});
}
+ if ($scan_drbd_peer_replication_speed)
+ {
+ $hash->{total_resync_rate} += $scan_drbd_peer_replication_speed;
+ }
push @{$connections}, {
protocol => "async_".lc($scan_drbd_peer_protocol),
connection => $scan_drbd_peer_connection_state,
diff --git a/share/words.xml b/share/words.xml
index 5db55ede..fd270be4 100644
--- a/share/words.xml
+++ b/share/words.xml
@@ -2106,7 +2106,7 @@ If you are comfortable that the target has changed for a known reason, you can s
No UPSes
This is a condition record, used by programs like scan agents to track how long a condition has existed for.
This indicated why a machine was powered off. This is used by ScanCore to decide if or when to power up the target host.
- Storage Pool #!variable!number!#
+ Storage group #!variable!number!#
Manage this file.
This will remove the file from all systems.
There are no #!string!brand_0006!# configured yet. Existing files will automatically sync to new clusters.