mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-05 09:10:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix subpool errors

Browse Source
This commit is contained in:
bergware
2023-10-26 00:45:39 +02:00
parent de4e0f1e14
commit 5df25dd3e2
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
emhttp/plugins/dynamix/CacheDevices.page
View File

@@ -16,19 +16,19 @@ Cond="($pool_devices || $var['fsState']=='Stopped')"
*/
?>
<?
// pool name ending in any of these => zfs subpool
$subpools = ['special','logs','dedup','cache','spares'];
function makeList($list) {
return implode(',',array_map('escapestring',$list));
}
function sharename($share) {
return basename($share,'.cfg');
}
$subpools = array( "special", "logs", "dedup", "cache", "spares");
function isSubpool($name) {
global $subpools;
// pool name ending in any of these => zfs subpool
$tildaPosition = strpos($name, '~');
$subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
$subpool = array_pad(explode('~',$name,2),2,'')[1];
return in_array($subpool,$subpools) ? $subpool : false;
}
?>
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">

15
emhttp/plugins/dynamix/nchan/device_list
View File

@@ -30,19 +30,19 @@ require_once "$docroot/webGui/include/Translations.php";
// remember current language
$locale_init = $locale;
// pool name ending in any of these => zfs subpool
$subpools = ['special','logs','dedup','cache','spares'];
function initSum() {
return ['count'=>0, 'temp'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0];
}
function model($id) {
return substr($id,0,strrpos($id,'_'));
}
$subpools = array( "special", "logs", "dedup", "cache", "spares");
function isSubpool($name) {
// pool name ending in any of these => zfs subpool
global $subpools;
$tildaPosition = strpos($name, '~');
$subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
$subpool = array_pad(explode('~',$name,2),2,'')[1];
return in_array($subpool,$subpools) ? $subpool : false;
}
function device_info(&$disk,$online) {
global $pools, $var, $crypto;
@@ -450,11 +450,12 @@ while (true) {
$echo[$n] = "pool_device".($n-2)."\n";
foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
if (_var($var,'fsState')=='Stopped') {
$log = file_exists($pool_log) ? parse_ini_file($pool_log) : [];
$log = @parse_ini_file($pool_log) ?: [];
$off = false;
foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) {
$echo[$n] .= array_offline($disk,$pool);
if (isset($log[_var($disk,'name')])) $off |= ($log[$disk['name']]!=_var($disk,'id')); else $log[_var($disk,'name')] = _var($disk,'id');
$diskname = str_replace('~','_-_',_var($disk,'name'));
if (isset($log[$diskname])) $off |= ($log[$diskname] != _var($disk,'id')); elseif ($diskname) $log[$diskname] = _var($disk,'id');
}
$data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
file_put_contents($pool_log,implode("\n",$data));