Skip to content

feat: add datanode prefix to datanode's data home #118

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
shawnh2 merged 2 commits into from
Aug 8, 2023
Merged

feat: add datanode prefix to datanode's data home #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed213c9
feat: add datanode prefix to datanode's data home
waynexia Aug 8, 2023
140ae9e
change dataHome to a vec
waynexia Aug 8, 2023
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
25 changes: 14 additions & 11 deletions pkg/deployer/baremetal/component/datanode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type datanode struct {
wg *sync.WaitGroup
logger logger.Logger

dataHome string
dataHome []string
dataNodeLogDirs []string
dataNodePidDirs []string
dataNodeDataDirs []string
Expand All @@ -54,15 +54,16 @@ func newDataNodes(config *config.Datanode, metaSrvAddr string, workDirs WorkDirs
}

func (d *datanode) Start(ctx context.Context, binary string) error {
dataHome := path.Join(d.workDirs.DataDir, "home")
if err := fileutils.CreateDirIfNotExists(dataHome); err != nil {
return err
}
d.dataHome = dataHome

for i := 0; i < d.config.Replicas; i++ {
dirName := fmt.Sprintf("datanode.%d", i)

dataHome := path.Join(d.workDirs.DataDir, dirName, "home")
if err := fileutils.CreateDirIfNotExists(dataHome); err != nil {
return err
}
d.dataHome = append(d.dataHome, dataHome)

datanodeLogDir := path.Join(d.workDirs.LogsDir, dirName)
if err := fileutils.CreateDirIfNotExists(datanodeLogDir); err != nil {
return err
Expand All @@ -81,7 +82,7 @@ func (d *datanode) Start(ctx context.Context, binary string) error {
}
d.dataNodeDataDirs = append(d.dataNodeDataDirs, path.Join(d.workDirs.DataDir, dirName))

if err := runBinary(ctx, binary, d.BuildArgs(ctx, i, walDir), datanodeLogDir, datanodePidDir, d.wg, d.logger); err != nil {
if err := runBinary(ctx, binary, d.BuildArgs(ctx, i, walDir, dataHome), datanodeLogDir, datanodePidDir, d.wg, d.logger); err != nil {
return err
}
}
Expand Down Expand Up @@ -111,7 +112,7 @@ func (d *datanode) BuildArgs(ctx context.Context, params ...interface{}) []strin
logLevel = "info"
}

nodeID_, walDir := params[0], params[1]
nodeID_, walDir, dataHome := params[0], params[1], params[2]
nodeID := nodeID_.(int)

args := []string{
Expand All @@ -121,7 +122,7 @@ func (d *datanode) BuildArgs(ctx context.Context, params ...interface{}) []strin
fmt.Sprintf("--metasrv-addr=%s", d.metaSrvAddr),
fmt.Sprintf("--rpc-addr=%s", generateDatanodeAddr(d.config.RPCAddr, nodeID)),
fmt.Sprintf("--http-addr=%s", generateDatanodeAddr(d.config.HTTPAddr, nodeID)),
fmt.Sprintf("--data-home=%s", d.dataHome),
fmt.Sprintf("--data-home=%s", dataHome),
fmt.Sprintf("--wal-dir=%s", walDir),
}
return args
Expand Down Expand Up @@ -155,8 +156,10 @@ func (d *datanode) IsRunning(ctx context.Context) bool {
}

func (d *datanode) Delete(ctx context.Context) error {
if err := fileutils.DeleteDirIfExists(d.dataHome); err != nil {
return err
for _, dir := range d.dataHome {
if err := fileutils.DeleteDirIfExists(dir); err != nil {
return err
}
}

for _, dir := range d.dataNodeLogDirs {
Expand Down