@@ -47,6 +47,7 @@ import (
47
47
"vitess.io/vitess/config"
48
48
"vitess.io/vitess/go/mysql"
49
49
"vitess.io/vitess/go/mysql/sqlerror"
50
+ "vitess.io/vitess/go/os2"
50
51
"vitess.io/vitess/go/osutil"
51
52
"vitess.io/vitess/go/protoutil"
52
53
"vitess.io/vitess/go/sqltypes"
@@ -901,7 +902,7 @@ func (mysqld *Mysqld) initConfig(cnf *Mycnf, outFile string) error {
901
902
return err
902
903
}
903
904
904
- return os .WriteFile (outFile , []byte (configData ), 0o664 )
905
+ return os2 .WriteFile (outFile , []byte (configData ))
905
906
}
906
907
907
908
func (mysqld * Mysqld ) getMycnfTemplate () string {
@@ -1051,7 +1052,7 @@ func (mysqld *Mysqld) ReinitConfig(ctx context.Context, cnf *Mycnf) error {
1051
1052
func (mysqld * Mysqld ) createDirs (cnf * Mycnf ) error {
1052
1053
tabletDir := cnf .TabletDir ()
1053
1054
log .Infof ("creating directory %s" , tabletDir )
1054
- if err := os .MkdirAll (tabletDir , os . ModePerm ); err != nil {
1055
+ if err := os2 .MkdirAll (tabletDir ); err != nil {
1055
1056
return err
1056
1057
}
1057
1058
for _ , dir := range TopLevelDirs () {
@@ -1061,7 +1062,7 @@ func (mysqld *Mysqld) createDirs(cnf *Mycnf) error {
1061
1062
}
1062
1063
for _ , dir := range cnf .directoryList () {
1063
1064
log .Infof ("creating directory %s" , dir )
1064
- if err := os .MkdirAll (dir , os . ModePerm ); err != nil {
1065
+ if err := os2 .MkdirAll (dir ); err != nil {
1065
1066
return err
1066
1067
}
1067
1068
// FIXME(msolomon) validate permissions?
@@ -1085,14 +1086,14 @@ func (mysqld *Mysqld) createTopDir(cnf *Mycnf, dir string) error {
1085
1086
if os .IsNotExist (err ) {
1086
1087
topdir := path .Join (tabletDir , dir )
1087
1088
log .Infof ("creating directory %s" , topdir )
1088
- return os .MkdirAll (topdir , os . ModePerm )
1089
+ return os2 .MkdirAll (topdir )
1089
1090
}
1090
1091
return err
1091
1092
}
1092
1093
linkto := path .Join (target , vtname )
1093
1094
source := path .Join (tabletDir , dir )
1094
1095
log .Infof ("creating directory %s" , linkto )
1095
- err = os .MkdirAll (linkto , os . ModePerm )
1096
+ err = os2 .MkdirAll (linkto )
1096
1097
if err != nil {
1097
1098
return err
1098
1099
}
0 commit comments