TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 100 Pull requests 4 Projects Releases 1 Activity Actions

[#1415] lens/explorer: Add timeout for opening database
All checks were successful
DCO action / DCO (pull_request) Successful in 1m14s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 1m21s
Details
Vulncheck / Vulncheck (pull_request) Successful in 2m6s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m22s
Details
Build / Build Components (pull_request) Successful in 2m32s
Details
Tests and linters / Staticcheck (pull_request) Successful in 2m50s
Details
Tests and linters / gopls check (pull_request) Successful in 2m50s
Details
Tests and linters / Lint (pull_request) Successful in 3m24s
Details
Tests and linters / Tests (pull_request) Successful in 4m27s
Details
Tests and linters / Tests with -race (pull_request) Successful in 6m2s
Details

Browse source 
Signed-off-by: Aleksey Savchuk <a.savchuk@yadro.com>
This commit is contained in:
Aleksey Savchuk 2024-10-07 18:32:26 +03:00
parent 5fbb2657ca
commit 0c49bca19c
4 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/frostfs-lens/internal/blobovnicza/tui.go
View file

@ -9,7 +9,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui"
"github.com/rivo/tview" "github.com/rivo/tview"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.etcd.io/bbolt"
) )
var tuiCMD = &cobra.Command{ var tuiCMD = &cobra.Command{
@ -43,7 +42,7 @@ func tuiFunc(cmd *cobra.Command, _ []string) {
} }
func runTUI(cmd *cobra.Command) error { func runTUI(cmd *cobra.Command) error {
db, err := openDB(false) db, err := tui.OpenDB(vPath, false)
if err != nil { if err != nil {
return fmt.Errorf("couldn't open database: %w", err) return fmt.Errorf("couldn't open database: %w", err)
} }
@ -67,13 +66,3 @@ func runTUI(cmd *cobra.Command) error {
app.SetRoot(ui, true).SetFocus(ui) app.SetRoot(ui, true).SetFocus(ui)
return app.Run() return app.Run()
} }
func openDB(writable bool) (*bbolt.DB, error) {
db, err := bbolt.Open(vPath, 0o600, &bbolt.Options{
ReadOnly: !writable,
})
if err != nil {
return nil, err
}
return db, nil
}

13
cmd/frostfs-lens/internal/meta/tui.go
View file

@ -9,7 +9,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui"
"github.com/rivo/tview" "github.com/rivo/tview"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.etcd.io/bbolt"
) )
var tuiCMD = &cobra.Command{ var tuiCMD = &cobra.Command{
@ -44,7 +43,7 @@ func tuiFunc(cmd *cobra.Command, _ []string) {
} }
func runTUI(cmd *cobra.Command) error { func runTUI(cmd *cobra.Command) error {
db, err := openDB(false) db, err := tui.OpenDB(vPath, false)
if err != nil { if err != nil {
return fmt.Errorf("couldn't open database: %w", err) return fmt.Errorf("couldn't open database: %w", err)
} }
@ -70,13 +69,3 @@ func runTUI(cmd *cobra.Command) error {
app.SetRoot(ui, true).SetFocus(ui) app.SetRoot(ui, true).SetFocus(ui)
return app.Run() return app.Run()
} }
func openDB(writable bool) (*bbolt.DB, error) {
db, err := bbolt.Open(vPath, 0o600, &bbolt.Options{
ReadOnly: !writable,
})
if err != nil {
return nil, err
}
return db, nil
}

13
cmd/frostfs-lens/internal/tui/util.go
View file

@ -3,12 +3,25 @@ package tui
import ( import (
"errors" "errors"
"strings" "strings"
"time"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
"github.com/mr-tron/base58" "github.com/mr-tron/base58"
"go.etcd.io/bbolt"
) )
func OpenDB(path string, writable bool) (*bbolt.DB, error) {
db, err := bbolt.Open(path, 0o600, &bbolt.Options{
ReadOnly: !writable,
Timeout: 100 * time.Millisecond,
})
if err != nil {
return nil, err
}
return db, nil
}
func CIDParser(s string) (any, error) { func CIDParser(s string) (any, error) {
data, err := base58.Decode(s) data, err := base58.Decode(s)
if err != nil { if err != nil {

13
cmd/frostfs-lens/internal/writecache/tui.go
View file

@ -9,7 +9,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/tui"
"github.com/rivo/tview" "github.com/rivo/tview"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.etcd.io/bbolt"
) )
var tuiCMD = &cobra.Command{ var tuiCMD = &cobra.Command{
@ -43,7 +42,7 @@ func tuiFunc(cmd *cobra.Command, _ []string) {
} }
func runTUI(cmd *cobra.Command) error { func runTUI(cmd *cobra.Command) error {
db, err := openDB(false) db, err := tui.OpenDB(vPath, false)
if err != nil { if err != nil {
return fmt.Errorf("couldn't open database: %w", err) return fmt.Errorf("couldn't open database: %w", err)
} }
@ -67,13 +66,3 @@ func runTUI(cmd *cobra.Command) error {
app.SetRoot(ui, true).SetFocus(ui) app.SetRoot(ui, true).SetFocus(ui)
return app.Run() return app.Run()
} }
func openDB(writable bool) (*bbolt.DB, error) {
db, err := bbolt.Open(vPath, 0o600, &bbolt.Options{
ReadOnly: !writable,
})
if err != nil {
return nil, err
}
return db, nil
}