Skip to content

feat: Increase ulimit in unix environment #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spangenberg merged 1 commit into from
Jan 18, 2022
Merged

feat: Increase ulimit in unix environment #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,13 @@ func init() {

rootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
rootCmd.SetUsageTemplate(usageTemplate)
cobra.OnInitialize(initConfig, initLogging, initSentry)
cobra.OnInitialize(initConfig, initLogging, initUlimit, initSentry)
}

func initUlimit() {
if fileDescriptorF != nil {
fileDescriptorF()
}
}

func initConfig() {
Expand Down
45 changes: 45 additions & 0 deletions cmd/ulimit_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//go:build darwin || linux
// +build darwin linux

package cmd

import (
"fmt"
"syscall"

zerolog "github.com/rs/zerolog/log"
)

const ulimitUnix uint64 = 16384

func init() {
fileDescriptorF = checkAndSetUlimitUnix
Copy link
Copy Markdown
Contributor

@yevgenypats yevgenypats Jan 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we can call checkAndSetUlimitUnix directly ? This should also remove the need for this check unless Im missing some edge-case

Copy link
Copy Markdown
Contributor Author

@spangenberg spangenberg Jan 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should fail on windows if I'm not completely mistaken. Since syscall is not available.

}

func checkAndSetUlimitUnix() {
logger := zerolog.Logger
if err := setUlimit(ulimitUnix); err != nil {
logger.Err(fmt.Errorf("error setting ulimit: %w", err))
}
}

func setUlimit(ulimit uint64) error {
logger := zerolog.Logger
rLimit, err := getUlimit()
if err != nil {
logger.Err(fmt.Errorf("error getting ulimit: %w", err))
}
if rLimit.Max < ulimit {
logger.Debug().Uint64("previous_ulimit", rLimit.Max).Uint64("new_ulimit", ulimit).Msg("adjusting max ulimit")
rLimit.Max = ulimit
}
logger.Debug().Uint64("previous_ulimit", rLimit.Cur).Uint64("new_ulimit", ulimit).Msg("adjusting current ulimit")
rLimit.Cur = ulimit
return syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
}

func getUlimit() (syscall.Rlimit, error) {
var rLimit syscall.Rlimit
err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
return rLimit, err
}
14 changes: 9 additions & 5 deletions cmd/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,23 @@ import (
"os"
"time"

"github.com/cloudquery/cloudquery/internal/logging"
"github.com/cloudquery/cloudquery/internal/signalcontext"
"github.com/cloudquery/cloudquery/internal/telemetry"
"github.com/cloudquery/cloudquery/pkg/ui"
"github.com/cloudquery/cloudquery/pkg/ui/console"
"github.com/getsentry/sentry-go"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"

"github.com/cloudquery/cloudquery/internal/logging"
"github.com/cloudquery/cloudquery/internal/signalcontext"
"github.com/cloudquery/cloudquery/internal/telemetry"
"github.com/cloudquery/cloudquery/pkg/ui"
"github.com/cloudquery/cloudquery/pkg/ui/console"
)

// fileDescriptorF gets set trough system relevant files like ulimit_unix.go
var fileDescriptorF func()

func handleCommand(f func(context.Context, *console.Client, *cobra.Command, []string) error) func(cmd *cobra.Command, args []string) {
return func(cmd *cobra.Command, args []string) {
var exitWithCode int
Expand Down