Skip to content

Commit 550ab37

Browse files
Dipta Dastamalsaha
Dipta Das
authored and
tamalsaha
committed
Apply nice/ionice settings from env (#746)
1 parent 42ed76b commit 550ab37

File tree

8 files changed

+97
-0
lines changed

8 files changed

+97
-0
lines changed

‎backup_mongo.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/appscode/go/flags"
88
"github.com/appscode/stash/pkg/restic"
9+
"github.com/appscode/stash/pkg/util"
910
"github.com/spf13/cobra"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1112
"k8s.io/apimachinery/pkg/util/errors"
@@ -50,6 +51,17 @@ func NewCmdBackupMongo() *cobra.Command {
5051
RunE: func(cmd *cobra.Command, args []string) error {
5152
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
5253

54+
// apply nice, ionice settings from env
55+
var err error
56+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
57+
if err != nil {
58+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
59+
}
60+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
61+
if err != nil {
62+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
63+
}
64+
5365
// prepare client
5466
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
5567
if err != nil {

‎backup_mysql.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/appscode/go/flags"
77
"github.com/appscode/stash/pkg/restic"
8+
"github.com/appscode/stash/pkg/util"
89
"github.com/spf13/cobra"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/util/errors"
@@ -50,6 +51,17 @@ func NewCmdBackupMySql() *cobra.Command {
5051
RunE: func(cmd *cobra.Command, args []string) error {
5152
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
5253

54+
// apply nice, ionice settings from env
55+
var err error
56+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
57+
if err != nil {
58+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
59+
}
60+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
61+
if err != nil {
62+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
63+
}
64+
5365
// prepare client
5466
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
5567
if err != nil {

‎backup_pg.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/appscode/go/flags"
1010
"github.com/appscode/go/log"
1111
"github.com/appscode/stash/pkg/restic"
12+
"github.com/appscode/stash/pkg/util"
1213
"github.com/spf13/cobra"
1314
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1415
"k8s.io/apimachinery/pkg/util/errors"
@@ -54,6 +55,17 @@ func NewCmdBackupPG() *cobra.Command {
5455
RunE: func(cmd *cobra.Command, args []string) error {
5556
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
5657

58+
// apply nice, ionice settings from env
59+
var err error
60+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
61+
if err != nil {
62+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
63+
}
64+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
65+
if err != nil {
66+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
67+
}
68+
5769
// prepare client
5870
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
5971
if err != nil {

‎backup_pvc.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/appscode/go/log"
88
api_v1beta1 "github.com/appscode/stash/apis/stash/v1beta1"
99
"github.com/appscode/stash/pkg/restic"
10+
"github.com/appscode/stash/pkg/util"
1011
"github.com/spf13/cobra"
1112
"k8s.io/apimachinery/pkg/util/errors"
1213
)
@@ -35,6 +36,17 @@ func NewCmdBackupPVC() *cobra.Command {
3536
RunE: func(cmd *cobra.Command, args []string) error {
3637
flags.EnsureRequiredFlags(cmd, "backup-dirs", "provider", "secret-dir")
3738

39+
// apply nice, ionice settings from env
40+
var err error
41+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
42+
if err != nil {
43+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
44+
}
45+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
46+
if err != nil {
47+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
48+
}
49+
3850
// init restic wrapper
3951
resticWrapper, err := restic.NewResticWrapper(setupOpt)
4052
if err != nil {

‎restore_mongo.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/appscode/go/flags"
88
"github.com/appscode/stash/pkg/restic"
9+
"github.com/appscode/stash/pkg/util"
910
"github.com/spf13/cobra"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1112
"k8s.io/apimachinery/pkg/util/errors"
@@ -41,6 +42,17 @@ func NewCmdRestoreMongo() *cobra.Command {
4142
RunE: func(cmd *cobra.Command, args []string) error {
4243
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
4344

45+
// apply nice, ionice settings from env
46+
var err error
47+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
48+
if err != nil {
49+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
50+
}
51+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
52+
if err != nil {
53+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
54+
}
55+
4456
// prepare client
4557
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
4658
if err != nil {

‎restore_mysql.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/appscode/go/flags"
77
"github.com/appscode/stash/pkg/restic"
8+
"github.com/appscode/stash/pkg/util"
89
"github.com/spf13/cobra"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/util/errors"
@@ -40,6 +41,17 @@ func NewCmdRestoreMySql() *cobra.Command {
4041
RunE: func(cmd *cobra.Command, args []string) error {
4142
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
4243

44+
// apply nice, ionice settings from env
45+
var err error
46+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
47+
if err != nil {
48+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
49+
}
50+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
51+
if err != nil {
52+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
53+
}
54+
4355
// prepare client
4456
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
4557
if err != nil {

‎restore_pg.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/appscode/go/flags"
77
"github.com/appscode/stash/pkg/restic"
8+
"github.com/appscode/stash/pkg/util"
89
"github.com/spf13/cobra"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/util/errors"
@@ -40,6 +41,17 @@ func NewCmdRestorePG() *cobra.Command {
4041
RunE: func(cmd *cobra.Command, args []string) error {
4142
flags.EnsureRequiredFlags(cmd, "app-binding", "provider", "secret-dir")
4243

44+
// apply nice, ionice settings from env
45+
var err error
46+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
47+
if err != nil {
48+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
49+
}
50+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
51+
if err != nil {
52+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
53+
}
54+
4355
// prepare client
4456
config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
4557
if err != nil {

‎restore_pvc.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/appscode/go/flags"
77
"github.com/appscode/stash/pkg/restic"
8+
"github.com/appscode/stash/pkg/util"
89
"github.com/spf13/cobra"
910
"k8s.io/apimachinery/pkg/util/errors"
1011
)
@@ -32,6 +33,18 @@ func NewCmdRestorePVC() *cobra.Command {
3233
DisableAutoGenTag: true,
3334
RunE: func(cmd *cobra.Command, args []string) error {
3435
flags.EnsureRequiredFlags(cmd, "restore-dirs", "provider", "secret-dir")
36+
37+
// apply nice, ionice settings from env
38+
var err error
39+
setupOpt.Nice, err = util.NiceSettingsFromEnv()
40+
if err != nil {
41+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
42+
}
43+
setupOpt.IONice, err = util.IONiceSettingsFromEnv()
44+
if err != nil {
45+
return handleResticError(outputDir, restic.DefaultOutputFileName, err)
46+
}
47+
3548
// init restic wrapper
3649
resticWrapper, err := restic.NewResticWrapper(setupOpt)
3750
if err != nil {

0 commit comments

Comments
 (0)