refactor: auto-mount スクリプトの改善(マウント健全性チェック方式を刷新)
This commit is contained in:
1 parent
8f6ab47363
commit
54881f5d68
2 files changed
+42
-52
No files matched your search
+31
-42
@@ -1,6 +1,7 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Google Drive (G:) WSL2 Auto-Mount & MusicDownloader Recovery Script
|
# Google Drive (G:) WSL2 Auto-Mount & MusicDownloader Health Check Script
|
||||||
# Runs automatically on Windows logon to ensure G: drive is mounted into WSL2.
|
# Periodically monitors Google Drive mount status and automatically repairs
|
||||||
|
# broken mounts or stale containers.
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
$logDir = "C:\feeds\Log"
|
$logDir = "C:\feeds\Log"
|
||||||
@@ -16,55 +17,43 @@ function Write-Log($msg) {
|
|||||||
Add-Content -Path $logFile -Value $line -Encoding UTF8
|
Add-Content -Path $logFile -Value $line -Encoding UTF8
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Log "=========================================================="
|
# 1. ホスト側 Google Drive (G:) のアクセス健全性確認
|
||||||
Write-Log "Start Google Drive Auto-Mount and MusicDownloader Health Check"
|
if (!(Test-Path "G:\マイドライブ\MyMusic") -or !(Test-Path "C:\MyMusic")) {
|
||||||
Write-Log "=========================================================="
|
# ホスト側で Google Drive が起動していない場合は何もしない
|
||||||
|
exit 0
|
||||||
# 1. Wait for Google Drive (max 180s)
|
|
||||||
# C:\MyMusic is a junction pointing to G:\マイドライブ\MyMusic
|
|
||||||
$maxWaitSeconds = 180
|
|
||||||
$waited = 0
|
|
||||||
|
|
||||||
Write-Log "Waiting for Google Drive (C:\MyMusic\playlists.txt)..."
|
|
||||||
while (!(Test-Path "C:\MyMusic\playlists.txt") -and ($waited -lt $maxWaitSeconds)) {
|
|
||||||
Start-Sleep -Seconds 3
|
|
||||||
$waited += 3
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(Test-Path "C:\MyMusic\playlists.txt")) {
|
# 2. WSL2 (docker-desktop) 上の Google Drive マウント健全性確認
|
||||||
Write-Log "[Warning] Google Drive target (C:\MyMusic\playlists.txt) not accessible within $maxWaitSeconds seconds."
|
$wslCheckCmd = "ls -d /mnt/host/c/MyMusic/Youtube >/dev/null 2>&1"
|
||||||
exit 1
|
$null = wsl -d docker-desktop sh -c $wslCheckCmd 2>&1
|
||||||
|
$isWslMountBroken = ($LASTEXITCODE -ne 0)
|
||||||
|
|
||||||
|
if ($isWslMountBroken) {
|
||||||
|
Write-Log "[異常検知] WSL2 の Google Drive マウント切断 (Invalid argument 等) を検知しました。マウントを修復します..."
|
||||||
|
|
||||||
|
$remountCmd = "while umount -l /tmp/docker-desktop-root/run/desktop/mnt/host/g 2>/dev/null; do :; done; while umount -l /tmp/docker-desktop-root/mnt/host/g 2>/dev/null; do :; done; while umount -l /mnt/host/g 2>/dev/null; do :; done; mkdir -p /mnt/host/g && mount -t drvfs G: /mnt/host/g && mkdir -p /tmp/docker-desktop-root/run/desktop/mnt/host/g /tmp/docker-desktop-root/mnt/host/g && mount --bind /mnt/host/g /tmp/docker-desktop-root/run/desktop/mnt/host/g && mount --bind /mnt/host/g /tmp/docker-desktop-root/mnt/host/g && (ls -d /mnt/host/c/MyMusic/Youtube >/dev/null 2>&1 && echo 'MOUNT_OK' || echo 'MOUNT_NG')"
|
||||||
|
$remountResult = wsl -d docker-desktop sh -c $remountCmd 2>&1
|
||||||
|
Write-Log "WSL2 再マウント結果: $remountResult"
|
||||||
}
|
}
|
||||||
Write-Log "[OK] Google Drive detected and accessible via junction (waited: ${waited}s)"
|
|
||||||
|
|
||||||
# 2. Update WSL2 mounts
|
# 3. MusicDownloader コンテナの健全性確認および復旧
|
||||||
Write-Log "Updating WSL2 mounts for G: drive..."
|
|
||||||
$shCmd = "while umount -l /tmp/docker-desktop-root/run/desktop/mnt/host/g 2>/dev/null; do :; done; while umount -l /tmp/docker-desktop-root/mnt/host/g 2>/dev/null; do :; done; while umount -l /mnt/host/g 2>/dev/null; do :; done; mkdir -p /mnt/host/g && mount -t drvfs G: /mnt/host/g && mkdir -p /tmp/docker-desktop-root/run/desktop/mnt/host/g /tmp/docker-desktop-root/mnt/host/g && mount --bind /mnt/host/g /tmp/docker-desktop-root/run/desktop/mnt/host/g && mount --bind /mnt/host/g /tmp/docker-desktop-root/mnt/host/g && (ls -d /mnt/host/c/MyMusic/Youtube >/dev/null 2>&1 && echo 'MOUNT_OK' || echo 'MOUNT_NG')"
|
|
||||||
|
|
||||||
$mountResult = wsl -d docker-desktop sh -c $shCmd
|
|
||||||
Write-Log "WSL2 Mount Result: $mountResult"
|
|
||||||
|
|
||||||
# 3. Check and recover MusicDownloader container
|
|
||||||
try {
|
try {
|
||||||
$containerStatus = docker inspect MusicDownloader --format "{{.State.Status}}" 2>&1
|
$containerStatus = docker inspect MusicDownloader --format "{{.State.Status}}" 2>&1
|
||||||
if ($containerStatus -eq "running") {
|
if ($containerStatus -eq "running") {
|
||||||
$mountCheck = docker exec MusicDownloader sh -c "mount | grep 'on /music'" 2>&1
|
# コンテナ内部からのマウントアクセス確認
|
||||||
Write-Log "Container mount status: $mountCheck"
|
$null = docker exec MusicDownloader ls -d /music/Youtube 2>&1
|
||||||
|
$isContainerMountBroken = ($LASTEXITCODE -ne 0)
|
||||||
|
|
||||||
$isReadOnly = ($mountCheck -match '\b(ro)\b') -or ($mountCheck -like "*overlay*") -or ($mountCheck -notlike "*G:*")
|
if ($isWslMountBroken -or $isContainerMountBroken) {
|
||||||
if ($isReadOnly) {
|
Write-Log "[コンテナ修復] コンテナ内のマウント無効化を検知しました。MusicDownloader を再起動します..."
|
||||||
Write-Log "[Notice] Container mount is Read-only or stale. Restarting MusicDownloader..."
|
|
||||||
docker restart MusicDownloader | Out-Null
|
docker restart MusicDownloader | Out-Null
|
||||||
Write-Log "[Success] MusicDownloader container restarted."
|
Write-Log "[成功] MusicDownloader コンテナを再起動しました。"
|
||||||
} else {
|
|
||||||
Write-Log "[OK] MusicDownloader container is running with healthy mount (rw)."
|
|
||||||
}
|
}
|
||||||
} else {
|
} elseif ($containerStatus -eq "exited" -or $containerStatus -eq "created") {
|
||||||
Write-Log "Container status: $containerStatus. Starting container..."
|
Write-Log "コンテナが停止しています (Status: $containerStatus)。MusicDownloader を起動します..."
|
||||||
docker start MusicDownloader 2>&1 | Out-Null
|
docker start MusicDownloader | Out-Null
|
||||||
|
Write-Log "[成功] MusicDownloader コンテナを起動しました。"
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
Write-Log "[Error] Exception occurred while inspecting container: $_"
|
Write-Log "[エラー] コンテナ確認中に例外が発生しました: $_"
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Log "Auto-mount process completed successfully."
|
|
||||||
+11
-10
@@ -1,4 +1,4 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Setup Startup Task and Shortcut for MusicDownloader Auto-Mount
|
# Setup Startup Task and Shortcut for MusicDownloader Auto-Mount
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
@@ -6,23 +6,24 @@ $scriptDir = "C:\VS2026\MusicDownloader"
|
|||||||
$vbsPath = Join-Path $scriptDir "run-auto-mount-silent.vbs"
|
$vbsPath = Join-Path $scriptDir "run-auto-mount-silent.vbs"
|
||||||
$ps1Path = Join-Path $scriptDir "auto-mount-gdrive.ps1"
|
$ps1Path = Join-Path $scriptDir "auto-mount-gdrive.ps1"
|
||||||
|
|
||||||
# 1. Register to Startup Folder
|
# 1. Register to Startup Folder (PC起動時・ログオン時の即座実行用)
|
||||||
$startupFolder = [Environment]::GetFolderPath([Environment+SpecialFolder]::Startup)
|
$startupFolder = [Environment]::GetFolderPath([Environment+SpecialFolder]::Startup)
|
||||||
$startupVbs = Join-Path $startupFolder "MusicDownloader-AutoMount.vbs"
|
$startupVbs = Join-Path $startupFolder "MusicDownloader-AutoMount.vbs"
|
||||||
Copy-Item -Path $vbsPath -Destination $startupVbs -Force
|
Copy-Item -Path $vbsPath -Destination $startupVbs -Force
|
||||||
Write-Host "[OK] Startup folder configured: $startupVbs"
|
Write-Host "[OK] Startup folder configured: $startupVbs"
|
||||||
|
|
||||||
# 2. Register to Windows Task Scheduler (At Logon)
|
# 2. Register to Windows Task Scheduler (5分ごとの定期ヘルスチェック&自動復旧用)
|
||||||
$taskName = "MusicDownloader-AutoMount"
|
$taskName = "MusicDownloader-AutoMount"
|
||||||
$action = New-ScheduledTaskAction -Execute "wscript.exe" -Argument "`"$vbsPath`""
|
$taskCmd = "wscript.exe $vbsPath"
|
||||||
$trigger = New-ScheduledTaskTrigger -AtLogOn
|
|
||||||
$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit (New-TimeSpan -Minutes 10)
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
# 既存タスクがあれば上書き登録
|
# schtasks を用いて一般ユーザー権限でも登録可能な5分毎タスクを作成
|
||||||
Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
|
& schtasks /create /tn $taskName /tr $taskCmd /sc minute /mo 5 /f | Out-Null
|
||||||
Register-ScheduledTask -TaskName $taskName -Action $action -Trigger $trigger -Settings $settings -Description "Auto-mounts Google Drive (G:) to WSL2 and recovers MusicDownloader container on logon" | Out-Null
|
if ($LASTEXITCODE -eq 0) {
|
||||||
Write-Host "[OK] Task Scheduler configured: $taskName"
|
Write-Host "[OK] Task Scheduler configured (every 5 mins): $taskName"
|
||||||
|
} else {
|
||||||
|
Write-Warning "[Warning] schtasks failed with exit code: $LASTEXITCODE"
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
Write-Warning "[Warning] Failed to register ScheduledTask: $_"
|
Write-Warning "[Warning] Failed to register ScheduledTask: $_"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user