Skip to content

Commit 704c9e2

Browse files
committed
fix file/directory permissions within mysqlctl
Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
1 parent 9ddc845 commit 704c9e2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

go/vt/mysqlctl/mysqld.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
"vitess.io/vitess/config"
4848
"vitess.io/vitess/go/mysql"
4949
"vitess.io/vitess/go/mysql/sqlerror"
50+
"vitess.io/vitess/go/os2"
5051
"vitess.io/vitess/go/osutil"
5152
"vitess.io/vitess/go/protoutil"
5253
"vitess.io/vitess/go/sqltypes"
@@ -901,7 +902,7 @@ func (mysqld *Mysqld) initConfig(cnf *Mycnf, outFile string) error {
901902
return err
902903
}
903904

904-
return os.WriteFile(outFile, []byte(configData), 0o664)
905+
return os2.WriteFile(outFile, []byte(configData))
905906
}
906907

907908
func (mysqld *Mysqld) getMycnfTemplate() string {
@@ -1051,7 +1052,7 @@ func (mysqld *Mysqld) ReinitConfig(ctx context.Context, cnf *Mycnf) error {
10511052
func (mysqld *Mysqld) createDirs(cnf *Mycnf) error {
10521053
tabletDir := cnf.TabletDir()
10531054
log.Infof("creating directory %s", tabletDir)
1054-
if err := os.MkdirAll(tabletDir, os.ModePerm); err != nil {
1055+
if err := os2.MkdirAll(tabletDir); err != nil {
10551056
return err
10561057
}
10571058
for _, dir := range TopLevelDirs() {
@@ -1061,7 +1062,7 @@ func (mysqld *Mysqld) createDirs(cnf *Mycnf) error {
10611062
}
10621063
for _, dir := range cnf.directoryList() {
10631064
log.Infof("creating directory %s", dir)
1064-
if err := os.MkdirAll(dir, os.ModePerm); err != nil {
1065+
if err := os2.MkdirAll(dir); err != nil {
10651066
return err
10661067
}
10671068
// FIXME(msolomon) validate permissions?
@@ -1085,14 +1086,14 @@ func (mysqld *Mysqld) createTopDir(cnf *Mycnf, dir string) error {
10851086
if os.IsNotExist(err) {
10861087
topdir := path.Join(tabletDir, dir)
10871088
log.Infof("creating directory %s", topdir)
1088-
return os.MkdirAll(topdir, os.ModePerm)
1089+
return os2.MkdirAll(topdir)
10891090
}
10901091
return err
10911092
}
10921093
linkto := path.Join(target, vtname)
10931094
source := path.Join(tabletDir, dir)
10941095
log.Infof("creating directory %s", linkto)
1095-
err = os.MkdirAll(linkto, os.ModePerm)
1096+
err = os2.MkdirAll(linkto)
10961097
if err != nil {
10971098
return err
10981099
}

0 commit comments

Comments
 (0)