Skip to content

Commit 87805e0

Browse files
committed
remove debug log
1 parent 878483a commit 87805e0

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

pkg/blob/nodeserver.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,9 @@ func (d *Driver) mountBlobfuseWithProxy(args string, authEnv []string) (string,
166166

167167
func (d *Driver) mountBlobfuseInsideDriver(args string, authEnv []string) (string, error) {
168168
klog.V(2).Infof("mounting blobfuse inside driver")
169-
// TODO: revert to blobfuse
170-
args = "mount " + args
171-
cmd := exec.Command("blobfuse2", strings.Split(args, " ")...)
169+
cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
172170
cmd.Env = append(os.Environ(), authEnv...)
173-
klog.Infof("xxxxxxxxxxxxxxx args %v", args)
174-
klog.Infof("xxxxxxxxxxxxxxx authEnv %v", authEnv)
175171
output, err := cmd.CombinedOutput()
176-
klog.Infof("xxxxxxxxxxxxxxx output %v", string(output))
177172
return string(output), err
178173
}
179174

pkg/blobfuse-proxy/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func getBlobfuseVersion() server.BlobfuseVersion {
8585
klog.Errorf("failed to get OS info: %v, default using blobfuse v1", err)
8686
return server.BlobfuseV1
8787
}
88-
klog.V(2).Infof("OS info: %v", OSInfo)
88+
klog.Infof("OS info: %v", OSInfo)
8989

9090
if OSInfo["DISTRIB_ID"] == "Ubuntu" && OSInfo["DISTRIB_RELEASE"] >= "22.04" {
9191
return server.BlobfuseV2

pkg/blobfuse-proxy/server/server.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,16 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
6565

6666
var cmd *exec.Cmd
6767
var result mount_azure_blob.MountAzureBlobResponse
68-
// switch server.blobfuseVersion {
69-
// case BlobfuseV1:
70-
// cmd = exec.Command("blobfuse", strings.Split(args, " ")...)
71-
// case BlobfuseV2:
72-
// args = "mount " + args
73-
// cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
74-
// }
75-
args = "mount " + args
76-
cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
68+
switch server.blobfuseVersion {
69+
case BlobfuseV1:
70+
cmd = exec.Command("blobfuse", strings.Split(args, " ")...)
71+
case BlobfuseV2:
72+
args = "mount " + args
73+
cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
74+
}
7775

7876
cmd.Env = append(cmd.Env, authEnv...)
79-
klog.Infof("zzzzzzzzzzzzzzz args %v", args)
80-
klog.Infof("zzzzzzzzzzzzzzz authEnv %v", authEnv)
8177
output, err := cmd.CombinedOutput()
82-
klog.Infof("zzzzzzzzzzzzzzz output %v", string(output))
8378
if err != nil {
8479
klog.Error("blobfuse mount failed: with error:", err.Error())
8580
} else {

0 commit comments

Comments
 (0)