diff options
Diffstat (limited to 'seaweedfs-rdma-sidecar')
| -rw-r--r-- | seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml | 2 | ||||
| -rw-r--r-- | seaweedfs-rdma-sidecar/test-fixes-standalone.go | 46 |
2 files changed, 23 insertions, 25 deletions
diff --git a/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml b/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml index 39eef0048..9098515ef 100644 --- a/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml +++ b/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: # SeaweedFS Master seaweedfs-master: diff --git a/seaweedfs-rdma-sidecar/test-fixes-standalone.go b/seaweedfs-rdma-sidecar/test-fixes-standalone.go index 8d3697c68..5b709bc7b 100644 --- a/seaweedfs-rdma-sidecar/test-fixes-standalone.go +++ b/seaweedfs-rdma-sidecar/test-fixes-standalone.go @@ -31,7 +31,7 @@ func parseUint64(s string, defaultValue uint64) uint64 { // Test the improved error reporting pattern (from weed/mount/rdma_client.go fix) func testErrorReporting() { - fmt.Println("🔧 Testing Error Reporting Fix:") + fmt.Println("Testing Error Reporting Fix:") // Simulate RDMA failure followed by HTTP failure rdmaErr := fmt.Errorf("RDMA connection timeout") @@ -39,24 +39,24 @@ func testErrorReporting() { // OLD (incorrect) way: oldError := fmt.Errorf("both RDMA and HTTP fallback failed: RDMA=%v, HTTP=%v", rdmaErr, rdmaErr) // BUG: same error twice - fmt.Printf(" ❌ Old (buggy): %v\n", oldError) + fmt.Printf(" Old (buggy): %v\n", oldError) // NEW (fixed) way: newError := fmt.Errorf("both RDMA and HTTP fallback failed: RDMA=%v, HTTP=%v", rdmaErr, httpErr) // FIXED: different errors - fmt.Printf(" ✅ New (fixed): %v\n", newError) + fmt.Printf(" New (fixed): %v\n", newError) } // Test weed mount command with RDMA flags (from docker-compose fix) func testWeedMountCommand() { - fmt.Println("🔧 Testing Weed Mount Command Fix:") + fmt.Println("Testing Weed Mount Command Fix:") // OLD (missing RDMA flags): oldCommand := "/usr/local/bin/weed mount -filer=seaweedfs-filer:8888 -dir=/mnt/seaweedfs -allowOthers=true -debug" - fmt.Printf(" ❌ Old (missing RDMA): %s\n", oldCommand) + fmt.Printf(" Old (missing RDMA): %s\n", oldCommand) // NEW (with RDMA flags): newCommand := "/usr/local/bin/weed mount -filer=${FILER_ADDR} -dir=${MOUNT_POINT} -allowOthers=true -rdma.enabled=${RDMA_ENABLED} -rdma.sidecar=${RDMA_SIDECAR_ADDR} -rdma.fallback=${RDMA_FALLBACK} -rdma.maxConcurrent=${RDMA_MAX_CONCURRENT} -rdma.timeoutMs=${RDMA_TIMEOUT_MS} -debug=${DEBUG}" - fmt.Printf(" ✅ New (with RDMA): %s\n", newCommand) + fmt.Printf(" New (with RDMA): %s\n", newCommand) // Check if RDMA flags are present rdmaFlags := []string{"-rdma.enabled", "-rdma.sidecar", "-rdma.fallback", "-rdma.maxConcurrent", "-rdma.timeoutMs"} @@ -69,38 +69,38 @@ func testWeedMountCommand() { } if allPresent { - fmt.Println(" ✅ All RDMA flags present in command") + fmt.Println(" All RDMA flags present in command") } else { - fmt.Println(" ❌ Missing RDMA flags") + fmt.Println(" Missing RDMA flags") } } // Test health check robustness (from Dockerfile.rdma-engine fix) func testHealthCheck() { - fmt.Println("🔧 Testing Health Check Fix:") + fmt.Println("Testing Health Check Fix:") // OLD (hardcoded): oldHealthCheck := "test -S /tmp/rdma-engine.sock" - fmt.Printf(" ❌ Old (hardcoded): %s\n", oldHealthCheck) + fmt.Printf(" Old (hardcoded): %s\n", oldHealthCheck) // NEW (robust): newHealthCheck := `pgrep rdma-engine-server >/dev/null && test -d /tmp/rdma && test "$(find /tmp/rdma -name '*.sock' | wc -l)" -gt 0` - fmt.Printf(" ✅ New (robust): %s\n", newHealthCheck) + fmt.Printf(" New (robust): %s\n", newHealthCheck) } func main() { - fmt.Println("🎯 Testing All GitHub PR Review Fixes") + fmt.Println("Testing All GitHub PR Review Fixes") fmt.Println("====================================") fmt.Println() // Test parse functions - fmt.Println("🔧 Testing Parse Functions Fix:") + fmt.Println("Testing Parse Functions Fix:") fmt.Printf(" parseUint32('123', 0) = %d (expected: 123)\n", parseUint32("123", 0)) fmt.Printf(" parseUint32('', 999) = %d (expected: 999)\n", parseUint32("", 999)) fmt.Printf(" parseUint32('invalid', 999) = %d (expected: 999)\n", parseUint32("invalid", 999)) fmt.Printf(" parseUint64('12345678901234', 0) = %d (expected: 12345678901234)\n", parseUint64("12345678901234", 0)) fmt.Printf(" parseUint64('invalid', 999) = %d (expected: 999)\n", parseUint64("invalid", 999)) - fmt.Println(" ✅ Parse functions handle errors correctly!") + fmt.Println(" Parse functions handle errors correctly!") fmt.Println() testErrorReporting() @@ -112,16 +112,16 @@ func main() { testHealthCheck() fmt.Println() - fmt.Println("🎉 All Review Fixes Validated!") + fmt.Println("All Review Fixes Validated!") fmt.Println("=============================") fmt.Println() - fmt.Println("✅ Parse functions: Safe error handling with strconv.ParseUint") - fmt.Println("✅ Error reporting: Proper distinction between RDMA and HTTP errors") - fmt.Println("✅ Weed mount: RDMA flags properly included in Docker command") - fmt.Println("✅ Health check: Robust socket detection without hardcoding") - fmt.Println("✅ File ID parsing: Reuses existing SeaweedFS functions") - fmt.Println("✅ Semaphore handling: No more channel close panics") - fmt.Println("✅ Go.mod documentation: Clear instructions for contributors") + fmt.Println("Parse functions: Safe error handling with strconv.ParseUint") + fmt.Println("Error reporting: Proper distinction between RDMA and HTTP errors") + fmt.Println("Weed mount: RDMA flags properly included in Docker command") + fmt.Println("Health check: Robust socket detection without hardcoding") + fmt.Println("File ID parsing: Reuses existing SeaweedFS functions") + fmt.Println("Semaphore handling: No more channel close panics") + fmt.Println("Go.mod documentation: Clear instructions for contributors") fmt.Println() - fmt.Println("🚀 Ready for production deployment!") + fmt.Println("Ready for production deployment!") } |