From 4f13764740f71bed78e92875893fa9f09d3046a0 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 3 Apr 2023 22:05:30 +0200 Subject: [PATCH 1/8] Shares: changed "cache" options This is a prroposal --- languages/en_US/helptext.txt | 26 ++++++++++++++++++++++++++ plugins/dynamix/ShareEdit.page | 20 ++++++++++---------- plugins/dynamix/ShareList.page | 2 +- plugins/dynamix/include/ShareList.php | 15 ++++++++++++++- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/languages/en_US/helptext.txt b/languages/en_US/helptext.txt index 63d166390..3e8564c2c 100644 --- a/languages/en_US/helptext.txt +++ b/languages/en_US/helptext.txt @@ -578,6 +578,32 @@ disks are not selected here, then the share may expand into *all* array disks. Specify the disks which can *not* be used by the share. By default no disks are excluded. :end +:share_edit_cache_pool_help_20230401: +Specify whether new files and folders written on the share can be written onto the pool if present. +This setting also affects *mover* behavior. + +**On array only** prohibits new files and folders from being written onto the pool. +*Mover* will take no action so any existing files for this share that are on the pool are left there. + +**On pool, overflow or move to array** indicates that all new files and folders should be written to the pool, provided +enough free space exists on the pool. +If there is insufficient space on the pool, then new files and folders are created on the array. +When the *mover* is invoked, files and folders are transferred off the pool and onto the array. + +**On pool only** indicates that all new files and folders must be written to the pool. +If there is insufficient free space on the pool, *create* operations will fail with *out of space* status. +*Mover* will take no action so any existing files for this share that are on the array are left there. + +**On pool if present else on array, move to pool** indicates that all new files and folders should be written to the pool, provided +enough free space exists on the pool. +If there is insufficient space on the pool, then new files and folders are created on the array. +When the *mover* is invoked, files and folders are transferred off the array and onto the pool. + +**NOTE:** Mover will never move any files that are currently in use. +This means if you want to move files associated with system services such as Docker or VMs then you need to +disable these services while mover is running. +:end + :share_edit_cache_pool_help: Specify whether new files and directories written on the share can be written onto the Cache disk/pool if present. This setting also affects *mover* behavior. diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index 67698515b..b3e9204ba 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -100,17 +100,17 @@ _(Comments)_: :share_edit_comments_help: -_(Use cache pool (for new files/directories))_: -: > + + + + :share_edit_cache_pool_help: -_(Select cache pool)_: +_(Select pool)_: : +: + **_(Start)_** _(will bring the array on-line)_. + Date: Sat, 8 Apr 2023 11:18:33 +0200 Subject: [PATCH 7/8] Dashboard: fix color of wrench icon --- plugins/dynamix/DashStats.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 9aa140b92..9d18afa65 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -212,7 +212,7 @@ i.indent{display:inline-block;width:18px} i.f32{font-size:32px!important} i.f14{font-size:1.4rem!important} i.fa.orb{margin-left:0} -i.fa-wrench{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important} +i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important} i[class^="icon-"]{font-size:1.6rem;margin-right:8px} i[class^="icon-u-"]{font-size:inherit} i#mycase[class^="case-"]{font-size:128px} From 3f3bdc9e74f5b7362097bd3df8815bac3a82e2c6 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 9 Apr 2023 10:18:09 +0200 Subject: [PATCH 8/8] Revert "Shares: changed "cache" options" This reverts commit 4f13764740f71bed78e92875893fa9f09d3046a0. --- languages/en_US/helptext.txt | 26 -------------------------- plugins/dynamix/ShareEdit.page | 20 ++++++++++---------- plugins/dynamix/ShareList.page | 2 +- plugins/dynamix/include/ShareList.php | 15 +-------------- 4 files changed, 12 insertions(+), 51 deletions(-) diff --git a/languages/en_US/helptext.txt b/languages/en_US/helptext.txt index 3e8564c2c..63d166390 100644 --- a/languages/en_US/helptext.txt +++ b/languages/en_US/helptext.txt @@ -578,32 +578,6 @@ disks are not selected here, then the share may expand into *all* array disks. Specify the disks which can *not* be used by the share. By default no disks are excluded. :end -:share_edit_cache_pool_help_20230401: -Specify whether new files and folders written on the share can be written onto the pool if present. -This setting also affects *mover* behavior. - -**On array only** prohibits new files and folders from being written onto the pool. -*Mover* will take no action so any existing files for this share that are on the pool are left there. - -**On pool, overflow or move to array** indicates that all new files and folders should be written to the pool, provided -enough free space exists on the pool. -If there is insufficient space on the pool, then new files and folders are created on the array. -When the *mover* is invoked, files and folders are transferred off the pool and onto the array. - -**On pool only** indicates that all new files and folders must be written to the pool. -If there is insufficient free space on the pool, *create* operations will fail with *out of space* status. -*Mover* will take no action so any existing files for this share that are on the array are left there. - -**On pool if present else on array, move to pool** indicates that all new files and folders should be written to the pool, provided -enough free space exists on the pool. -If there is insufficient space on the pool, then new files and folders are created on the array. -When the *mover* is invoked, files and folders are transferred off the array and onto the pool. - -**NOTE:** Mover will never move any files that are currently in use. -This means if you want to move files associated with system services such as Docker or VMs then you need to -disable these services while mover is running. -:end - :share_edit_cache_pool_help: Specify whether new files and directories written on the share can be written onto the Cache disk/pool if present. This setting also affects *mover* behavior. diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index b3e9204ba..67698515b 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -100,17 +100,17 @@ _(Comments)_: :share_edit_comments_help: -_(Placement of new files/folders)_: -: > + + + + :share_edit_cache_pool_help: -_(Select pool)_: +_(Select cache pool)_: : +: