Skip to content

Commit

Permalink
Update to go 1.20.5 (#1191)
Browse files Browse the repository at this point in the history
* Upgrade dependencies

* Upgrade to go 1.20.5
  • Loading branch information
vibhansa-msft authored Jun 30, 2023
1 parent 985e9dc commit 9dfbd32
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion azure-pipeline-templates/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-pipeline-templates/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ 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"

# Alternative custom script for Self-Hosted agents to install Go-lang
- 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"

Expand Down
2 changes: 1 addition & 1 deletion azure-pipeline-templates/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion blobfuse2-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "Select Go Version"

- task: Go@0
Expand Down
2 changes: 1 addition & 1 deletion blobfuse2-code-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
14 changes: 7 additions & 7 deletions blobfuse2-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions blobfuse2-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -367,7 +367,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -461,7 +461,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -564,7 +564,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -681,7 +681,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -782,7 +782,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -872,7 +872,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down Expand Up @@ -964,7 +964,7 @@ stages:

- task: GoTool@0
inputs:
version: '1.19.9'
version: '1.20.5'
displayName: "GoTool Setup"

- script: |
Expand Down
5 changes: 5 additions & 0 deletions component/azstorage/azstorage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 0 additions & 5 deletions component/azstorage/block_blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 9dfbd32

Please sign in to comment.