Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync_read: deprecated #1

Open
wants to merge 4 commits into
base: latest
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Unraid_Scripts/rclone_mount.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DOCKER_BIN="/usr/bin/docker"
RCLONE_REMOTE="remote:/subfolder/"

# Rclone & mergerfs mount points
MOUNT_POINT="/mnt/user/cloud/rclonevfs"
MOUNT_POINT_REMOTE="/mnt/user/cloud/rclonevfs"
MOUNT_POINT_LOCAL="/mnt/user/cloud/local"
MOUNT_POINT_MERGERFS="/mnt/user/cloud/merged"

Expand Down Expand Up @@ -58,7 +58,7 @@ live_status_check() {
}

create_required_dirs_and_files() {
for dir in $MOUNT_POINT $MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS; do
for dir in $MOUNT_POINT_REMOTE $MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS; do
if [ ! -d "$dir" ]; then
echo -e "\033[33mDirectory $dir does not exist. Creating...\033[0m"
mkdir -p "$dir"
Expand Down Expand Up @@ -107,14 +107,14 @@ start() {
exit 1
fi

if ! is_mounted $MOUNT_POINT; then
if ! is_mounted $MOUNT_POINT_REMOTE; then
echo -e "\033[32mRunning rclone VFS mount...\033[0m"
$RCLONE_BIN mount $RCLONE_REMOTE $MOUNT_POINT --config $RCLONE_CONFIG --user-agent='Mozilla/5.0' $COMMON_RCLONE_OPTIONS --log-file $LOG_FILE --cache-dir $CACHE_DIR --daemon
$RCLONE_BIN mount $RCLONE_REMOTE $MOUNT_POINT_REMOTE --config $RCLONE_CONFIG --user-agent='Mozilla/5.0' $COMMON_RCLONE_OPTIONS --log-file $LOG_FILE --cache-dir $CACHE_DIR --daemon
fi

if ! is_mounted $MOUNT_POINT_MERGERFS; then
echo -e "\033[32mRunning mergerfs...\033[0m"
$MERGERFS_BIN $MOUNT_POINT:$MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS -o defaults,sync_read,allow_other,category.action=all,category.create=ff
$MERGERFS_BIN $MOUNT_POINT_REMOTE:$MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS -o defaults,async_read=false,allow_other,category.action=all,category.create=ff
fi

start_docker_containers
Expand All @@ -127,13 +127,13 @@ stop() {
$MERGERFS_FUSERMOUNT_BIN -uz $MOUNT_POINT_MERGERFS
fi

if is_mounted $MOUNT_POINT; then
$MERGERFS_FUSERMOUNT_BIN -uz $MOUNT_POINT
if is_mounted $MOUNT_POINT_REMOTE; then
$MERGERFS_FUSERMOUNT_BIN -uz $MOUNT_POINT_REMOTE
fi
}

status() {
if is_mounted $MOUNT_POINT; then
if is_mounted $MOUNT_POINT_REMOTE; then
echo -e "\033[32mrclone VFS mount is running.\033[0m"
else
echo -e "\033[31mrclone VFS mount is not running.\033[0m"
Expand All @@ -155,7 +155,7 @@ status() {
}

ensure() {
if ! is_mounted $MOUNT_POINT; then
if ! is_mounted $MOUNT_POINT_REMOTE; then
echo -e "\033[31mrclone VFS mount is not mounted or not functioning correctly. Remounting...\033[0m"
stop
start
Expand All @@ -170,8 +170,8 @@ ensure() {

exit_test_mode() {
echo -e "\033[31mExiting test mode...\033[0m"
if is_mounted $MOUNT_POINT; then
$MERGERFS_FUSERMOUNT_BIN -uz $MOUNT_POINT
if is_mounted $MOUNT_POINT_REMOTE; then
$MERGERFS_FUSERMOUNT_BIN -uz $MOUNT_POINT_REMOTE
fi
stop
exit 0
Expand Down
2 changes: 1 addition & 1 deletion Unraid_Scripts/rclone_multimount.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ start() {
# Start mergerfs
if ! is_mounted $MOUNT_POINT_MERGERFS; then
echo -e "\033[32mRunning mergerfs...\033[0m"
$MERGERFS_BIN $MOUNT_POINT_REMOTE1:$MOUNT_POINT_REMOTE2:$MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS -o defaults,sync_read,allow_other,category.action=all,category.create=ff
$MERGERFS_BIN $MOUNT_POINT_REMOTE1:$MOUNT_POINT_REMOTE2:$MOUNT_POINT_LOCAL $MOUNT_POINT_MERGERFS -o defaults,async_read=false,allow_other,category.action=all,category.create=ff
fi

# Start Docker containers
Expand Down