Skip to content

Commit dc5c46b

Browse files
authored
Merge pull request #339 from zhucan/bugfix-222
bugfix-222 Driver should check socket parent directory before trying …
2 parents eb20bb3 + 8abacc4 commit dc5c46b

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

pkg/gce-pd-csi-driver/server.go

+11
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"net"
1919
"net/url"
2020
"os"
21+
"path/filepath"
2122
"sync"
2223

2324
"google.golang.org/grpc"
@@ -86,6 +87,16 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
8687
if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
8788
klog.Fatalf("Failed to remove %s, error: %s", addr, err.Error())
8889
}
90+
91+
listenDir := filepath.Dir(addr)
92+
if _, err := os.Stat(listenDir); err != nil {
93+
if os.IsNotExist(err) {
94+
klog.Fatalf("Expected Kubelet plugin watcher to create parent dir %s but did not find such a dir", listenDir)
95+
} else {
96+
klog.Fatalf("Failed to stat %s, error: %s", listenDir, err.Error())
97+
}
98+
}
99+
89100
} else if u.Scheme == "tcp" {
90101
addr = u.Host
91102
} else {

0 commit comments

Comments
 (0)