From 9dfbd329f42d12a7bd8daf0afcbbaa872aa6e594 Mon Sep 17 00:00:00 2001 From: Vikas Bhansali <64532198+vibhansa-msft@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:55:34 +0530 Subject: [PATCH] Update to go 1.20.5 (#1191) * Upgrade dependencies * Upgrade to go 1.20.5 --- azure-pipeline-templates/build-release.yml | 2 +- azure-pipeline-templates/build.yml | 4 ++-- azure-pipeline-templates/setup.yml | 2 +- blobfuse2-ci.yaml | 2 +- blobfuse2-code-coverage.yaml | 2 +- blobfuse2-nightly.yaml | 14 +++++++------- blobfuse2-release.yaml | 16 ++++++++-------- component/azstorage/azstorage.go | 5 +++++ component/azstorage/block_blob.go | 5 ----- go.mod | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/azure-pipeline-templates/build-release.yml b/azure-pipeline-templates/build-release.yml index c3122a5ae..f8bc81ec5 100644 --- a/azure-pipeline-templates/build-release.yml +++ b/azure-pipeline-templates/build-release.yml @@ -17,7 +17,7 @@ steps: - task: ShellScript@2 inputs: scriptPath: "${{ parameters.work_dir }}/go_installer.sh" - args: "${{ parameters.root_dir }}/ 1.19.9" + args: "${{ parameters.root_dir }}/ 1.20.5" displayName: "Installing Go tools" # Installing Blobfuse2 Dependencies via go get diff --git a/azure-pipeline-templates/build.yml b/azure-pipeline-templates/build.yml index 5bef26312..d3f26383d 100755 --- a/azure-pipeline-templates/build.yml +++ b/azure-pipeline-templates/build.yml @@ -41,7 +41,7 @@ steps: # GoTool task used only for Microsoft Hosted Agents to install Go-lang - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' condition: ${{ parameters.hostedAgent }} displayName: "GoTool Setup" @@ -49,7 +49,7 @@ steps: - task: ShellScript@2 inputs: scriptPath: "${{ parameters.working_directory }}/go_installer.sh" - args: "${{ parameters.root_dir }}/ 1.19.9" + args: "${{ parameters.root_dir }}/ 1.20.5" condition: not(${{parameters.hostedAgent }}) displayName: "GoTool Custom Setup" diff --git a/azure-pipeline-templates/setup.yml b/azure-pipeline-templates/setup.yml index 72e38a53e..6dc3d4beb 100644 --- a/azure-pipeline-templates/setup.yml +++ b/azure-pipeline-templates/setup.yml @@ -16,7 +16,7 @@ steps: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" # Create directory structure and prepare to mount diff --git a/blobfuse2-ci.yaml b/blobfuse2-ci.yaml index 808acc9a6..69d4d6c56 100644 --- a/blobfuse2-ci.yaml +++ b/blobfuse2-ci.yaml @@ -35,7 +35,7 @@ jobs: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Select Go Version" - task: Go@0 diff --git a/blobfuse2-code-coverage.yaml b/blobfuse2-code-coverage.yaml index 6557cddba..39c766e24 100644 --- a/blobfuse2-code-coverage.yaml +++ b/blobfuse2-code-coverage.yaml @@ -752,7 +752,7 @@ stages: # GoTool task used only for Microsoft Hosted Agents to install Go-lang - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | diff --git a/blobfuse2-nightly.yaml b/blobfuse2-nightly.yaml index ab0501eba..2ef4f21fd 100755 --- a/blobfuse2-nightly.yaml +++ b/blobfuse2-nightly.yaml @@ -602,7 +602,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - script: | @@ -684,7 +684,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - script: | @@ -757,7 +757,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - template: 'azure-pipeline-templates/distro-tests.yml' @@ -829,7 +829,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - template: 'azure-pipeline-templates/distro-tests.yml' @@ -896,7 +896,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - template: 'azure-pipeline-templates/distro-tests.yml' @@ -965,7 +965,7 @@ stages: # Go tool installer - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "Install Go Version" - template: 'azure-pipeline-templates/distro-tests.yml' @@ -1634,7 +1634,7 @@ stages: - task: ShellScript@2 inputs: scriptPath: "$(WORK_DIR)/go_installer.sh" - args: "$(ROOT_DIR)/ 1.19.9" + args: "$(ROOT_DIR)/ 1.20.5" displayName: "GoTool Custom Setup" # Downloading Go dependency packages diff --git a/blobfuse2-release.yaml b/blobfuse2-release.yaml index 6378b3970..77527c50c 100644 --- a/blobfuse2-release.yaml +++ b/blobfuse2-release.yaml @@ -268,7 +268,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -367,7 +367,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -461,7 +461,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -564,7 +564,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -681,7 +681,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -782,7 +782,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -872,7 +872,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | @@ -964,7 +964,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19.9' + version: '1.20.5' displayName: "GoTool Setup" - script: | diff --git a/component/azstorage/azstorage.go b/component/azstorage/azstorage.go index a354d4adf..ec5892064 100644 --- a/component/azstorage/azstorage.go +++ b/component/azstorage/azstorage.go @@ -40,6 +40,7 @@ import ( "syscall" "time" + azcopyCommon "github.com/Azure/azure-storage-azcopy/v10/common" "github.com/Azure/azure-storage-fuse/v2/common" "github.com/Azure/azure-storage-fuse/v2/common/config" "github.com/Azure/azure-storage-fuse/v2/common/log" @@ -169,6 +170,10 @@ func (az *AzStorage) Start(ctx context.Context) error { // create stats collector for azstorage azStatsCollector = stats_manager.NewStatsCollector(az.Name()) + // This is a workaround right now to disable the input watcher thread which continuously monitors below config to change + // Running this thread continuously increases the CPU usage by 5% even when there is no activity on blobfuse2 mount path + azcopyCommon.GetLifecycleMgr().EnableInputWatcher() + return nil } diff --git a/component/azstorage/block_blob.go b/component/azstorage/block_blob.go index 2e9983afb..be2cf866c 100644 --- a/component/azstorage/block_blob.go +++ b/component/azstorage/block_blob.go @@ -48,7 +48,6 @@ import ( "time" "github.com/Azure/azure-pipeline-go/pipeline" - azcopyCommon "github.com/Azure/azure-storage-azcopy/v10/common" "github.com/Azure/azure-storage-azcopy/v10/ste" "github.com/Azure/azure-storage-fuse/v2/common" "github.com/Azure/azure-storage-fuse/v2/common/log" @@ -174,10 +173,6 @@ func (bb *BlockBlob) SetupPipeline() error { log.Trace("BlockBlob::SetupPipeline : Setting up") var err error - // This is a workaround right now to disable the input watcher thread which continuously monitors below config to change - // Running this thread continuously increases the CPU usage by 5% even when there is no activity on blobfuse2 mount path - azcopyCommon.GetLifecycleMgr().EnableInputWatcher() - // Get the credential cred := bb.getCredential() if cred == nil { diff --git a/go.mod b/go.mod index 42eb2228f..f1d53007e 100755 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/azure-storage-fuse/v2 -go 1.19 +go 1.20 require ( github.com/Azure/azure-pipeline-go v0.2.4-0.20220425205405-09e6f201e1e4