mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-21 05:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Parity operation enhancements

Browse Source
This commit is contained in:
bergware
2022-02-13 10:44:00 +01:00
parent be75459e9c
commit 0ffd5eeeda
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/include/DefaultPageLayout.php
+7 -13
View File
@@ -607,24 +607,18 @@ defaultPage.on('message', function(msg,meta) {
case 1:
// message field in footer
var ini = parseINI(msg);
var state = ini['fsState'];
var progress = ini['fsProgress'];
var status;
if (state=='Stopped') {
status = "<span class='red strong'><i class='fa fa-stop-circle'></i> <?=_('Array Stopped')?></span>";
} else if (state=='Started') {
status = "<span class='green strong'><i class='fa fa-play-circle'></i> <?=_('Array Started')?></span>";
} else if (state=='Formatting') {
status = "<span class='green strong'><i class='fa fa-play-circle'></i> <?=_('Array Started')?></span>&bullet;<span class='orange strong'><?=_('Formatting device(s)')?></span>";
} else {
status = "<span class='orange strong'><i class='fa fa-pause-circle'></i> "+_('Array '+state)+"</span>";
switch (ini['fsState']) {
case 'Stopped' : var status = "<span class='red strong'><i class='fa fa-stop-circle'></i> <?=_('Array Stopped')?></span>"; break;
case 'Started' : var status = "<span class='green strong'><i class='fa fa-play-circle'></i> <?=_('Array Started')?></span>"; break;
case 'Formatting': var status = "<span class='green strong'><i class='fa fa-play-circle'></i> <?=_('Array Started')?></span>&bullet;<span class='orange strong'><?=_('Formatting device(s)')?></span>"; break;
default : var status = "<span class='orange strong'><i class='fa fa-pause-circle'></i> "+_('Array '+ini['fsState'])+"</span>";
}
if (ini['mdResyncPos']>0) {
var resync = ini['mdResyncAction'].split(/\s+/);
switch (resync[0]) {
case 'recon': var action = ['P','Q'].includes(resync[1]) ? "<?=_('Parity-Sync')?>" : "<?=_('Data-Rebuild')?>"; break;
case 'clear': var action = "<?=_('Disk-Clear')?>"; break;
case 'check': var action = resync.length>1 ? "<?=_('Parity-Check')?>" : "<?=_('Read-Check')?>"; break;
case 'clear': var action = "<?=_('Disk-Clear')?>"; break;
default : var action = '';
}
action += " "+(ini['mdResyncPos']/(ini['mdResyncSize']/100+1)).toFixed(1)+" %";
@@ -632,7 +626,7 @@ defaultPage.on('message', function(msg,meta) {
if (ini['mdResyncDt']==0) status += " &bullet; <?=_('Paused')?>";
status += "</span>";
}
if (progress) status += "&bullet;<span class='blue strong'>"+_(progress)+"</span>";
if (ini['fsProgress']) status += "&bullet;<span class='blue strong'>"+_(ini['fsProgress'])+"</span>";
$('#statusbar').html(status);
break;
case 2:
plugins/dynamix/nchan/update_2
+1 -1
View File
@@ -321,8 +321,8 @@ while (true) {
$action = preg_split('/\s+/',$var['mdResyncAction']);
switch ($action[0]) {
case "recon": $mode = in_array($action[1],['P','Q']) ? 'Parity-Sync' : 'Data-Rebuild'; break;
case "clear": $mode = 'Disk-Clear'; break;
case "check": $mode = count($action)>1 ? 'Parity-Check' : 'Read-Check'; break;
case "clear": $mode = 'Disk-Clear'; break;
default : $mode = ''; break;
}
$echo[3] .= "<span class='orange'>"._($mode).' '._('in progress').'... '._('Completed').': '.number_format($spot/($size/100+1),1,$number[0],$number[1])." %.</span>";
plugins/dynamix/scripts/monitor
+1 -1
View File
@@ -244,8 +244,8 @@ if ($var['mdResyncPos']) {
$action = preg_split('/\s+/',$var['mdResyncAction']);
switch ($action[0]) {
case 'recon': $last = in_array($action[1],['P','Q']) ? 'Parity-Sync' : 'Data-Rebuild'; break;
case 'clear': $last = 'Disk-Clear'; break;
case 'check': $last = count($action)>1 ? 'Parity-Check' : 'Read-Check'; break;
case 'clear': $last = 'Disk-Clear'; break;
default : $last = '';
}
$info = "Size: ".my_scale($var['mdResyncSize']*1024,$unit)." $unit";