Merge pull request #679 from pachyderm/fix_s3_reboot

Remove the leading slash for aws deployments.
pachyderm · Jul 22, 2016 · 6efecc8 · 6efecc8
2 parents 8a2a6c1 + 0428da5
commit 6efecc8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/server/pfs/server/server.go b/src/server/pfs/server/server.go
@@ -55,12 +55,17 @@ func NewObjBlockAPIServer(dir string, objClient obj.Client) (pfsclient.BlockAPIS
 func NewBlockAPIServer(dir string, backend string) (pfsclient.BlockAPIServer, error) {
 	switch backend {
 	case AmazonBackendEnvVar:
+		// amazon doesn't like leading slashes
+		if dir[0] == '/' {
+			dir = dir[1:]
+		}
 		blockAPIServer, err := newAmazonBlockAPIServer(dir)
 		if err != nil {
 			return nil, err
 		}
 		return blockAPIServer, nil
 	case GoogleBackendEnvVar:
+		// TODO figure out if google likes leading slashses
 		blockAPIServer, err := newGoogleBlockAPIServer(dir)
 		if err != nil {
 			return nil, err