diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | cmd/seaweedfs-csi-driver/main.go | 26 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/test.sh | 2 |
3 files changed, 19 insertions, 12 deletions
@@ -1,2 +1,5 @@ .vscode *.iml + +# go +_debug_bin
\ No newline at end of file diff --git a/cmd/seaweedfs-csi-driver/main.go b/cmd/seaweedfs-csi-driver/main.go index 5542b93..69403f1 100644 --- a/cmd/seaweedfs-csi-driver/main.go +++ b/cmd/seaweedfs-csi-driver/main.go @@ -17,12 +17,12 @@ var ( nodeID = flag.String("nodeid", "", "node id") version = flag.Bool("version", false, "Print the version and exit.") concurrentWriters = flag.Int("concurrentWriters", 32, "limit concurrent goroutine writers if not 0") - cacheCapacityMB = flag.Int("cacheCapacityMB", 0, "local file chunk cache capacity in MB") + cacheCapacityMB = flag.Int("cacheCapacityMB", 0, "local file chunk cache capacity in MB") cacheDir = flag.String("cacheDir", os.TempDir(), "local cache directory for file chunks and meta data") uidMap = flag.String("map.uid", "", "map local uid to uid on filer, comma-separated <local_uid>:<filer_uid>") gidMap = flag.String("map.gid", "", "map local gid to gid on filer, comma-separated <local_gid>:<filer_gid>") - dataCenter = flag.String("dataCenter", "", "dataCenter this node is running in (locality-definition)") - dataLocalityStr = flag.String("dataLocality", "", "which volume-nodes pods will use for activity (one-of: 'write_preferLocalDc'). Requires used locality-definitions to be set") + dataCenter = flag.String("dataCenter", "", "dataCenter this node is running in (locality-definition)") + dataLocalityStr = flag.String("dataLocality", "", "which volume-nodes pods will use for activity (one-of: 'write_preferLocalDc'). Requires used locality-definitions to be set") dataLocality datalocality.DataLocality ) @@ -40,15 +40,15 @@ func main() { } err := convertRequiredValues() - if(err != nil){ - glog.Error("Failed converting flag: ", err); - os.Exit(1); + if err != nil { + glog.Error("Failed converting flag: ", err) + os.Exit(1) } err = checkPreconditions() - if(err != nil){ - glog.Error("Precondition failed: ", err); - os.Exit(1); + if err != nil { + glog.Error("Precondition failed: ", err) + os.Exit(1) } glog.Infof("connect to filer %s", *filer) @@ -67,10 +67,10 @@ func main() { func convertRequiredValues() error { // Convert DataLocalityStr to DataLocality - if(*dataLocalityStr != ""){ + if *dataLocalityStr != "" { var ok bool dataLocality, ok = datalocality.FromString(*dataLocalityStr) - if(!ok){ + if !ok { return fmt.Errorf("dataLocality invalid value") } } @@ -83,5 +83,9 @@ func checkPreconditions() error { return err } + if len(*nodeID) == 0 { + return fmt.Errorf("driver requires node id to be set, use -nodeid=") + } + return nil } diff --git a/test/test.sh b/test/test.sh index c96e99b..5d6eb12 100644..100755 --- a/test/test.sh +++ b/test/test.sh @@ -12,7 +12,7 @@ weed server -dir=/tmp/seaweedfs/data -s3 -volume.max=100 -volume.port=8090 ## Run CSI Driver cd ../seaweedfs-csi-driver make build -./_output/seaweedfs-csi-driver -endpoint="$endpoint" -alsologtostderr -v=5 -filer=localhost:8888 +./_output/seaweedfs-csi-driver -endpoint="$endpoint" -alsologtostderr -v=5 -filer=localhost:8888 -nodeid=test # Run CSI Sanity Tests ../csi-test/cmd/csi-sanity/csi-sanity\ |