* Add remote.copy.local command to copy local files to remote storage This new command solves the issue described in GitHub Discussion #8031 where files exist locally but are not synced to remote storage due to missing filer logs. Features: - Copies local-only files to remote storage - Supports file filtering (include/exclude patterns) - Dry run mode to preview actions - Configurable concurrency for performance - Force update option for existing remote files - Comprehensive error handling with retry logic Usage: remote.copy.local -dir=/path/to/mount/dir [options] This addresses the need to manually sync files when filer logs were deleted or when local files were never synced to remote storage. * shell: rename commandRemoteLocalSync to commandRemoteCopyLocal * test: add comprehensive remote cache integration tests * shell: fix forceUpdate logic in remote.copy.local The previous logic only allowed force updates when localEntry.RemoteEntry was not nil, which defeated the purpose of using -forceUpdate to fix inconsistencies where local metadata might be missing. Now -forceUpdate will overwrite remote files whenever they exist, regardless of local metadata state. * shell: fix code review issues in remote.copy.local - Return actual error from flag parsing instead of swallowing it - Use sync.Once to safely capture first error in concurrent operations - Add atomic counter to track actual successful copies - Protect concurrent writes to output with mutex to prevent interleaving - Fix path matching to prevent false positives with sibling directories (e.g., /mnt/remote2 no longer matches /mnt/remote) * test: address code review nitpicks in integration tests - Improve create_bucket error handling to fail on real errors - Fix test assertions to properly verify expected failures - Use case-insensitive string matching for error detection - Replace weak logging-only tests with proper assertions - Remove extra blank line in Makefile * test: remove redundant edge case tests Removed 5 tests that were either duplicates or didn't assert meaningful behavior: - TestEdgeCaseEmptyDirectory (duplicate of TestRemoteCopyLocalEmptyDirectory) - TestEdgeCaseRapidCacheUncache (no meaningful assertions) - TestEdgeCaseConcurrentCommands (only logs errors, no assertions) - TestEdgeCaseInvalidPaths (no security assertions) - TestEdgeCaseFileNamePatterns (duplicate of pattern tests in cache tests) Kept valuable stress tests: nested directories, special characters, very large files (100MB), many small files (100), and zero-byte files. * test: fix CI failures by forcing localhost IP advertising Added -ip=127.0.0.1 flag to both primary and remote weed mini commands to prevent IP auto-detection issues in CI environments. Without this flag, the master would advertise itself using the actual IP (e.g., 10.1.0.17) while binding to 127.0.0.1, causing connection refused errors when other services tried to connect to the gRPC port. * test: address final code review issues - Add proper error assertions for concurrent commands test - Require errors for invalid path tests instead of just logging - Remove unused 'match' field from pattern test struct - Add dry-run output assertion to verify expected behavior - Simplify redundant condition in remote.copy.local (remove entry.RemoteEntry check) * test: fix remote.configure tests to match actual validation rules - Use only letters in remote names (no numbers) to match validation - Relax missing parameter test expectations since validation may not be strict - Generate unique names using letter suffix instead of numbers * shell: rename pathToCopyCopy to localPath for clarity Improved variable naming in concurrent copy loop to make the code more readable and less repetitive. * test: fix remaining test failures - Remove strict error requirement for invalid paths (commands handle gracefully) - Fix TestRemoteUncacheBasic to actually test uncache instead of cache - Use simple numeric names for remote.configure tests (testcfg1234 format) to avoid validation issues with letter-only or complex name generation * test: use only letters in remote.configure test names The validation regex ^[A-Za-z][A-Za-z0-9]*$ requires names to start with a letter, but using static letter-only names avoids any potential issues with the validation. * test: remove quotes from -name parameter in remote.configure tests Single quotes were being included as part of the name value, causing validation failures. Changed from -name='testremote' to -name=testremote. * test: fix remote.configure assertion to be flexible about JSON formatting Changed from checking exact JSON format with specific spacing to just checking if the name appears in the output, since JSON formatting may vary (e.g., "name": "value" vs "name": "value").
205 lines
7.6 KiB
Go
205 lines
7.6 KiB
Go
package remote_cache
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// TestRemoteMountBasic tests mounting a remote bucket to a local directory
|
|
func TestRemoteMountBasic(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
testDir := fmt.Sprintf("/buckets/testmount%d", time.Now().UnixNano()%1000000)
|
|
|
|
// Mount the remote bucket
|
|
t.Logf("Mounting remote bucket to %s...", testDir)
|
|
cmd := fmt.Sprintf("remote.mount -dir=%s -remote=seaweedremote/remotesourcebucket", testDir)
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to mount remote")
|
|
t.Logf("Mount output: %s", output)
|
|
|
|
// Verify mount exists in list
|
|
output, err = runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to list mounts")
|
|
assert.Contains(t, output, testDir, "mount not found in list")
|
|
|
|
// Clean up - unmount
|
|
t.Logf("Unmounting %s...", testDir)
|
|
cmd = fmt.Sprintf("remote.unmount -dir=%s", testDir)
|
|
_, err = runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to unmount")
|
|
}
|
|
|
|
// TestRemoteMountNonEmpty tests mounting with -nonempty flag
|
|
func TestRemoteMountNonEmpty(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
testDir := fmt.Sprintf("/buckets/testnonempty%d", time.Now().UnixNano()%1000000)
|
|
testFile := fmt.Sprintf("testfile-%d.txt", time.Now().UnixNano())
|
|
|
|
// First mount to create the directory
|
|
cmd := fmt.Sprintf("remote.mount -dir=%s -remote=seaweedremote/remotesourcebucket", testDir)
|
|
_, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to initial mount")
|
|
|
|
// Upload a file to make it non-empty
|
|
uploadToPrimary(t, testFile, []byte("test data"))
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
// Unmount
|
|
cmd = fmt.Sprintf("remote.unmount -dir=%s", testDir)
|
|
_, err = runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to unmount")
|
|
|
|
// Try to mount again with -nonempty flag (directory may have residual data)
|
|
t.Logf("Mounting with -nonempty flag...")
|
|
cmd = fmt.Sprintf("remote.mount -dir=%s -remote=seaweedremote/remotesourcebucket -nonempty=true", testDir)
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to mount with -nonempty")
|
|
t.Logf("Mount output: %s", output)
|
|
|
|
// Clean up
|
|
cmd = fmt.Sprintf("remote.unmount -dir=%s", testDir)
|
|
_, err = runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to unmount")
|
|
}
|
|
|
|
// TestRemoteMountInvalidRemote tests mounting with non-existent remote configuration
|
|
func TestRemoteMountInvalidRemote(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
testDir := fmt.Sprintf("/buckets/testinvalid%d", time.Now().UnixNano()%1000000)
|
|
invalidRemote := fmt.Sprintf("nonexistent%d/bucket", time.Now().UnixNano())
|
|
|
|
// Try to mount with invalid remote
|
|
cmd := fmt.Sprintf("remote.mount -dir=%s -remote=%s", testDir, invalidRemote)
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
|
|
// Should fail with invalid remote
|
|
hasError := err != nil || strings.Contains(strings.ToLower(output), "invalid") || strings.Contains(strings.ToLower(output), "error") || strings.Contains(strings.ToLower(output), "not found")
|
|
assert.True(t, hasError, "Expected error for invalid remote, got: %s", output)
|
|
t.Logf("Invalid remote result: err=%v, output: %s", err, output)
|
|
}
|
|
|
|
// TestRemoteMountList tests listing all mounts
|
|
func TestRemoteMountList(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
// List all mounts
|
|
output, err := runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to list mounts")
|
|
t.Logf("Mount list: %s", output)
|
|
|
|
// Should contain the default mount from setup
|
|
assert.Contains(t, output, "remotemounted", "default mount not found")
|
|
}
|
|
|
|
// TestRemoteUnmountBasic tests unmounting and verifying cleanup
|
|
func TestRemoteUnmountBasic(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
testDir := fmt.Sprintf("/buckets/testunmount%d", time.Now().UnixNano()%1000000)
|
|
|
|
// Mount first
|
|
cmd := fmt.Sprintf("remote.mount -dir=%s -remote=seaweedremote/remotesourcebucket", testDir)
|
|
_, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to mount")
|
|
|
|
// Verify it's mounted
|
|
output, err := runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to list mounts")
|
|
assert.Contains(t, output, testDir, "mount not found before unmount")
|
|
|
|
// Unmount
|
|
t.Logf("Unmounting %s...", testDir)
|
|
cmd = fmt.Sprintf("remote.unmount -dir=%s", testDir)
|
|
output, err = runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to unmount")
|
|
t.Logf("Unmount output: %s", output)
|
|
|
|
// Verify it's no longer mounted
|
|
output, err = runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to list mounts after unmount")
|
|
assert.NotContains(t, output, testDir, "mount still exists after unmount")
|
|
}
|
|
|
|
// TestRemoteUnmountNotMounted tests unmounting a non-mounted directory
|
|
func TestRemoteUnmountNotMounted(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
testDir := fmt.Sprintf("/buckets/notmounted%d", time.Now().UnixNano()%1000000)
|
|
|
|
// Try to unmount a directory that's not mounted
|
|
cmd := fmt.Sprintf("remote.unmount -dir=%s", testDir)
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
|
|
// Should fail or show error
|
|
hasError := err != nil || strings.Contains(strings.ToLower(output), "not mounted") || strings.Contains(strings.ToLower(output), "error")
|
|
assert.True(t, hasError, "Expected error for unmounting non-mounted directory, got: %s", output)
|
|
t.Logf("Unmount non-mounted result: err=%v, output: %s", err, output)
|
|
}
|
|
|
|
// TestRemoteMountBucketsBasic tests mounting all buckets from remote
|
|
func TestRemoteMountBucketsBasic(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
// List buckets in dry-run mode (without -apply)
|
|
t.Log("Listing buckets without -apply flag...")
|
|
cmd := "remote.mount.buckets -remote=seaweedremote"
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to list buckets")
|
|
t.Logf("Bucket list output: %s", output)
|
|
|
|
// Should show the remote bucket
|
|
assert.Contains(t, output, "remotesourcebucket", "remote bucket not found in list")
|
|
}
|
|
|
|
// TestRemoteMountBucketsWithPattern tests mounting with bucket pattern filter
|
|
func TestRemoteMountBucketsWithPattern(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
// Test with pattern matching
|
|
t.Log("Testing bucket pattern matching...")
|
|
cmd := "remote.mount.buckets -remote=seaweedremote -bucketPattern=remote*"
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to list buckets with pattern")
|
|
t.Logf("Pattern match output: %s", output)
|
|
|
|
// Should show matching buckets
|
|
assert.Contains(t, output, "remotesourcebucket", "matching bucket not found")
|
|
|
|
// Test with non-matching pattern
|
|
cmd = "remote.mount.buckets -remote=seaweedremote -bucketPattern=nonexistent*"
|
|
output, err = runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to list buckets with non-matching pattern")
|
|
t.Logf("Non-matching pattern output: %s", output)
|
|
}
|
|
|
|
// TestRemoteMountBucketsDryRun tests dry run mode (no -apply flag)
|
|
func TestRemoteMountBucketsDryRun(t *testing.T) {
|
|
checkServersRunning(t)
|
|
|
|
// Get initial mount list
|
|
initialOutput, err := runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to get initial mount list")
|
|
|
|
// Run mount.buckets without -apply (dry run)
|
|
t.Log("Running mount.buckets in dry-run mode...")
|
|
cmd := "remote.mount.buckets -remote=seaweedremote"
|
|
output, err := runWeedShellWithOutput(t, cmd)
|
|
require.NoError(t, err, "failed to run dry-run mount.buckets")
|
|
t.Logf("Dry-run output: %s", output)
|
|
|
|
// Get mount list after dry run
|
|
afterOutput, err := runWeedShellWithOutput(t, "remote.mount")
|
|
require.NoError(t, err, "failed to get mount list after dry-run")
|
|
|
|
// Mount list should be unchanged (dry run doesn't actually mount)
|
|
assert.Equal(t, initialOutput, afterOutput, "mount list changed after dry-run")
|
|
}
|