From 58509f1176bb44d3bf920ffd02c3cd23dece9871 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 21 Mar 2020 13:58:26 +0100
Subject: [PATCH] Multi cache support

---
 plugins/dynamix/ArrayOperation.page     |  6 +++---
 plugins/dynamix/CacheDevices.page       |  7 ++-----
 plugins/dynamix/CacheSettings.page      |  4 ++--
 plugins/dynamix/DashStats.page          |  1 -
 plugins/dynamix/DeviceInfo.page         |  1 -
 plugins/dynamix/MoverSettings.page      | 14 ++++++++++----
 plugins/dynamix/NewConfig.page          | 14 ++++++++++----
 plugins/dynamix/ShareEdit.page          |  2 --
 plugins/dynamix/include/PageBuilder.php |  2 +-
 plugins/dynamix/template.php            |  7 +++++++
 10 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 06edcb8b4..27f36a6c0 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -65,9 +65,9 @@ function status_indicator() {
   echo "<a class='info'><i class='fa fa-$orb orb $color-orb'></i><span>$help</span></a>";
 }
 function missing_cache() {
-  global $disks;
+  global $cache;
   $missing = false;
-  foreach ($disks as $disk) if ($disk['type']=='Cache') $missing |= (strpos($disk['status'],'_MISSING')!==false);
+  foreach ($cache as $disk) $missing |= (strpos($disk['status'],'_MISSING')!==false);
   return $missing;
 }
 ?>
@@ -512,7 +512,7 @@ function formatWarning(val) {
  <tr><td></td><td><input type="button" value="_(Clear Stats)_" onclick="toggle_state('Clear')"></td><td>**_(Clear Stats)_** _(will immediately clear all disk statistics)_.</td></tr>
  <tr><td></td><td class="line" colspan="2"></td></tr>
 </table>
-<?if ($var['shareCacheEnabled']=="yes" && is_dir("/mnt/cache")):?>
+<?if ($var['shareCacheEnabled']=="yes" && $pool_devices):?>
 <form name="mover_schedule" method="POST" action="/update.htm" target="progressFrame">
 <table markdown="1" class="array_status noshift">
  <tr><td></td>
diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index 23b5d4dd1..cbe14605f 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -1,6 +1,7 @@
 Menu="Main:2"
 Title="Pool Devices"
 Tag="bullseye"
+Cond="($pool_devices || $var['fsState']=='Stopped')"
 ---
 <?PHP
 /* Copyright 2005-2020, Lime Technology
@@ -14,11 +15,6 @@ Tag="bullseye"
  * all copies or substantial portions of the Software.
  */
 ?>
-<?
-$cache = cache_filter($disks);
-$pools = pools_filter($cache);
-$i = 0;
-?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <style>
 table.divider{margin-top:2px}
@@ -80,6 +76,7 @@ $('#tab2').bind({click:function() {$('i.toggle').show('slow');}});
 pool_status();
 </script>
 
+<?$i = 0?>
 <?foreach ($pools as $pool):?>
 <?if ($cache[$pool]['devicesSb'] || $var['fsState']=='Stopped'):?>
 <table class="disk_status wide<?=$i?' divider':''?>">
diff --git a/plugins/dynamix/CacheSettings.page b/plugins/dynamix/CacheSettings.page
index 05e614a7e..8e06d2d7f 100644
--- a/plugins/dynamix/CacheSettings.page
+++ b/plugins/dynamix/CacheSettings.page
@@ -1,7 +1,7 @@
 Menu="ShareSettings:2"
 Title="Cache Settings"
 Tag="upload"
-Cond="((isset($disks['cache']))&&($disks['cache']['status']!='DISK_NP'))"
+Cond="$pool_devices"
 ---
 <?PHP
 /* Copyright 2005-2020, Lime Technology
@@ -29,7 +29,7 @@ $(check_cache_settings);
 </script>
 
 <form markdown="1" name="cache_settings" method="POST" action="/update.htm" target="progressFrame">
-_(Use cache disk)_:
+_(Use cache device)_:
 : <select name="shareCacheEnabled" onchange="check_cache_settings()" <?=$disabled?>>
   <?=mk_option($var['shareCacheEnabled'], "yes", _('Yes'))?>
   <?=mk_option($var['shareCacheEnabled'], "no", _('No'))?>
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 091742141..6aedd87eb 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -63,7 +63,6 @@ $parity = $var['mdResync'];
 $mover = file_exists('/var/run/mover.pid');
 $btrfs = exec('pgrep -cf /sbin/btrfs');
 $dot = $display['number'][0];
-$pools = pools_filter(cache_filter($disks));
 
 foreach ($disks as $disk) {
   switch ($disk['type']) {
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 7480bd624..f6ee58754 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -19,7 +19,6 @@ require_once "$docroot/webGui/include/Preselect.php";
 $disk = &$disks[$name];
 $date = date('Ymd-Hi');
 $events = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
-$pools = pools_filter(cache_filter($disks));
 
 function displayTemp($temp) {
   global $display;
diff --git a/plugins/dynamix/MoverSettings.page b/plugins/dynamix/MoverSettings.page
index 33d3d8801..d067dc2d3 100644
--- a/plugins/dynamix/MoverSettings.page
+++ b/plugins/dynamix/MoverSettings.page
@@ -15,12 +15,16 @@ Tag="calendar-check-o"
  */
 ?>
 <?
-if (empty($disks['cache']) || $disks['cache']['status']=='DISK_NP') {
-  echo "<p class='notice'>"._('No Cache disk present')."!</p>";
-} elseif ($var['shareCacheEnabled']!='yes') {
-  echo "<p class='notice'>"._('Cache disk not enabled')."!</p>";
+$setup = true;
+if ($var['shareCacheEnabled']!='yes') {
+  echo "<p class='notice'>"._('Cache device not enabled')."!</p>";
+  $setup = false;
+} elseif (!$pool_devices) {
+  echo "<p class='notice'>"._('No Cache device present')."!</p>";
+  $setup = false;
 } elseif ($var['shareUser']=='-') {
   echo "<p class='notice'>"._('User shares not enabled')."!</p>";
+  $setup = false;
 }
 $cron = explode(' ',$var['shareMoverSchedule']);
 $move = $cron[2]!='*' ? 3 : ($cron[4]!='*' ? 2 : (substr($cron[1],0,1)!='*' ? 1 : 0));
@@ -54,6 +58,7 @@ function presetMover(form) {
 }
 </script>
 <form markdown="1" name="mover_schedule" method="POST" action="/update.htm" target="progressFrame" onsubmit="prepareMover(this)">
+<?if ($setup):?>
 _(Mover schedule)_:
 : <select name="shareMoverSchedule" onchange="presetMover(this.form)">
   <?for ($m=0; $m<count($mode); $m++):?>
@@ -127,6 +132,7 @@ _(Mover logging)_:
 > Write mover messages to the syslog file.
 :end
 
+<?endif;?>
 &nbsp;
 : <input type="submit" name="changeMover" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
 
diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index 634e016be..8a4b6cbc6 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -23,7 +23,7 @@ if ($newarray) {
   @unlink('/boot/config/smart-one.cfg');
   @unlink('/boot/config/smart-all.cfg');
   @unlink('/boot/config/plugins/dynamix/monitor.ini');
-  @unlink('/var/tmp/cache_log.tmp');
+  foreach ($pools as $pool) @unlink("/var/tmp/$pool.log.tmp");
 }
 ?>
 <style>
@@ -36,7 +36,9 @@ function prepareNewConfig(form) {
     switch (item.value) {
       case 'parity': if (item.selected) form.preserveParity.disabled = false; break;
       case 'data'  : if (item.selected) form.preserveData.disabled = false; break;
-      case 'cache' : if (item.selected) form.preserveCache.disabled = false; break;
+      <?foreach ($pools as $pool):?>
+      case '<?=$pool?>': if (item.selected) form.preserve<?=ucfirst($pool)?>.disabled = false; break;
+      <?endforeach;?>
     }
   }
   form.preset.disabled = true;
@@ -66,14 +68,18 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <form name="newConfig" method="POST" action="/update.htm" target="progressFrame" onsubmit="prepareNewConfig(this)">
 <input type="hidden" name="preserveParity" value="yes" disabled>
 <input type="hidden" name="preserveData" value="yes" disabled>
-<input type="hidden" name="preserveCache" value="yes" disabled>
+<?foreach ($pools as $pool):?>
+<input type="hidden" name="preserve<?=$pool?>" value="yes" disabled>
+<?endforeach;?>
 
 <span class="indent">_(Preserve current assignments)_:</span>
 <select id="s1" name="preset" multiple="multiple" style="display:none">
 <option value=''>_(All)_</option>
 <?=mk_option_check(0,'parity',_('Parity slots'))?>
 <?=mk_option_check(0,'data',_('Data slots'))?>
-<?=mk_option_check(0,'cache',_('Cache slots'))?>
+<?foreach ($pools as $pool):?>
+<?if ($cache[$pool]['devicesSb']) echo mk_option_check(0,$pool,ucfirst($pool).' '._('slots'))?>
+<?endforeach;?>
 </select>
 <br>
 <span class="indent"><input type="submit" class="lock" name="cmdInit" value="_(Apply)_" disabled><input type="button" class="lock" value="_(Done)_" onclick="done()"></span>
diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page
index a7e76a16c..27e9c90e0 100644
--- a/plugins/dynamix/ShareEdit.page
+++ b/plugins/dynamix/ShareEdit.page
@@ -16,8 +16,6 @@ Tag="share-alt-square"
 ?>
 <?
 $width = [123,300];
-$cache = cache_filter($disks);
-$pools = pools_filter($cache);
 
 if ($name == "") {
   /* default values when adding new share */
diff --git a/plugins/dynamix/include/PageBuilder.php b/plugins/dynamix/include/PageBuilder.php
index 1384d33af..2640c7bbf 100644
--- a/plugins/dynamix/include/PageBuilder.php
+++ b/plugins/dynamix/include/PageBuilder.php
@@ -41,7 +41,7 @@ function build_pages($pattern) {
 }
 
 function find_pages($item) {
-  global $docroot,$site,$var,$disks,$devs,$users,$shares,$sec,$sec_nfs,$name,$display;
+  global $docroot,$site,$var,$disks,$devs,$users,$shares,$sec,$sec_nfs,$name,$display,$pool_devices;
   $pages = [];
   foreach ($site as $page) {
     if (empty($page['Menu'])) continue;
diff --git a/plugins/dynamix/template.php b/plugins/dynamix/template.php
index 48505ba5a..1fbc86b13 100644
--- a/plugins/dynamix/template.php
+++ b/plugins/dynamix/template.php
@@ -31,6 +31,13 @@ $users   = (array)parse_ini_file('state/users.ini',true);
 $shares  = (array)parse_ini_file('state/shares.ini',true);
 $sec_nfs = (array)parse_ini_file('state/sec_nfs.ini',true);
 
+// Pool devices
+$cache = cache_filter($disks);
+$pools = pools_filter($cache);
+
+$pool_devices = false;
+foreach ($pools as $pool) $pool_devices |= $cache[$pool]['devicesSb'];
+
 // Read network settings
 extract(parse_ini_file('state/network.ini',true));