Skip to content

Commit 10c5c0f

Browse files
jackblack369jackblack369
committed
[container] change curve reference directory to dingo reference directory
1 parent db7897e commit 10c5c0f

File tree

20 files changed

+56
-59
lines changed

20 files changed

+56
-59
lines changed

‎configs/fs/cluster/client.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
kind: curvefs
2-
container_image: quay.io/opencurve/curve/curvefs:v2.7.0-rc1_d8a1137
1+
kind: dingofs
2+
container_image: dingodatabase/dingofs:latest
33
mdsOpt.rpcRetryOpt.addrs: 10.0.1.1:6700,10.0.1.2:6700,10.0.1.3:6700
4-
log_dir: /home/curve/curvefs/logs/client
4+
log_dir: ${home}/dingofs/logs/client
55

66
### if fstype is s3
77
s3.ak: <>

‎configs/fs/cluster/topology.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
kind: curvefs
1+
kind: dingofs
22
global:
33
report_usage: true
4-
data_dir: ${home}/curvefs/data/${service_role}
5-
log_dir: ${home}/curvefs/logs/${service_role}
6-
container_image: quay.io/opencurve/curve/curvefs:v2.7.0-rc1_d8a1137
4+
data_dir: ${home}/dingofs/data/${service_role}
5+
log_dir: ${home}/dingofs/logs/${service_role}
6+
container_image: dingodatabase/dingofs:latest
77
variable:
88
home: /tmp
99
machine1: server-host1

‎configs/fs/stand-alone/client.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: curvefs
2-
container_image: quay.io/opencurve/curve/curvefs:v2.7.0-rc1_d8a1137
2+
container_image: dingodatabase/dingofs:latest
33
mdsOpt.rpcRetryOpt.addrs: 10.0.1.1:6700,10.0.1.2:6700,10.0.1.3:6700
4-
log_dir: /home/curve/curvefs/logs/client
4+
log_dir: ${home}/dingofs/logs/client
55

66
### if fstype is s3
77
s3.ak: <>

‎configs/fs/stand-alone/topology.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
kind: curvefs
22
global:
33
report_usage: true
4-
data_dir: ${home}/curvefs/data/${service_role}${service_host_sequence}
5-
log_dir: ${home}/curvefs/logs/${service_role}${service_host_sequence}
6-
container_image: quay.io/opencurve/curve/curvefs:v2.7.0-rc1_d8a1137
4+
data_dir: ${home}/dingofs/data/${service_role}${service_host_sequence}
5+
log_dir: ${home}/dingofs/logs/${service_role}${service_host_sequence}
6+
container_image: dingodatabase/dingofs:latest
77
variable:
88
home: /tmp
99
target: server-host

‎docs/zh/REMEAD.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ global:
2828
ssh_port: 22
2929
private_key_file: /home/curve/.ssh/id_rsa
3030
report_usage: true
31-
data_dir: /home/${user}/curvefs/data/${service_role}${service_sequence}
32-
log_dir: /home/${user}/curvefs/logs/${service_role}${service_sequence}
33-
container_image: opencurvedocker/curvefs:latest
31+
data_dir: /home/${user}/dingofs/data/${service_role}${service_sequence}
32+
log_dir: /home/${user}/dingofs/logs/${service_role}${service_sequence}
33+
container_image: dingodatabase/dingofs:latest
3434
variable:
3535
target: 10.0.1.1
3636

@@ -172,7 +172,7 @@ container_image
172172

173173
> 默认值：
174174
>
175-
> 示例：opencurvedocker/curvefs:latest
175+
> 示例：dingodatabase/dingofs:latest
176176
>
177177
> 说明：服务镜像
178178
@@ -236,7 +236,7 @@ variable
236236
其他
237237
---
238238

239-
* `topology` 中的其余配置项与 `curvefs` 项目中的配置项保持一致，包括默认值，详见 [curvefs/conf](https://github.com/dingodb/curve/tree/fs/curvefs/conf)
239+
* `topology` 中的其余配置项与 `curvefs` 项目中的配置项保持一致，包括默认值，详见 [curvefs/conf](https://github.com/dingodb/curve/tree/fs/dingofs/conf)
240240
* 若想修改相关配置，在 `topology` 中修改即可，如修改 metaserver 中的日志等级，你可以在 `topology` 中增加以下配置项：
241241
```shell
242242
metaserver.loglevel: 9

‎internal/configure/playground.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
const (
3030
DEFAULT_CURVEBS_CONTAINER_IMAGE = "opencurvedocker/curvebs-playground:v1.2"
31-
DEFAULT_CURVEFS_CONTAINER_IMAGE = "opencurvedocker/curvefs-playground:v2.3"
31+
DEFAULT_CURVEFS_CONTAINER_IMAGE = "dingodatabase/dingofs-playground:v2.3"
3232
)
3333

3434
type (

‎internal/configure/topology/dc_get.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const (
4848
LAYOUT_CURVEBS_CHUNKFILE_POOL_DIR = "chunkfilepool"
4949
LAYOUT_CURVEBS_COPYSETS_DIR = "copysets"
5050
LAYOUT_CURVEBS_RECYCLER_DIR = "recycler"
51-
LAYOUT_CURVEBS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/curve/tools.conf"
52-
LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/curvefs/tools.conf" // TODO: keep tools config path
51+
LAYOUT_CURVEBS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/dingo/tools.conf"
52+
LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/dingofs/tools.conf" // v1 tools config path
5353
LAYOUT_CURVE_TOOLS_V2_CONFIG_SYSTEM_PATH = "/etc/dingo/dingo.yaml"
5454
LAYOUT_CORE_SYSTEM_DIR = "/core"
5555

@@ -226,7 +226,7 @@ type (
226226
ToolsConfDir string // /curvebs/tools/conf
227227
ToolsConfPath string // /curvebs/tools/conf/tools.conf
228228
ToolsConfSrcPath string // /curvebs/conf/tools.conf
229-
ToolsConfSystemPath string // /etc/curve/tools.conf
229+
ToolsConfSystemPath string // /etc/dingofs/tools.conf
230230
ToolsBinaryPath string // /curvebs/tools/sbin/curvebs-tool
231231

232232
// tools-v2
@@ -249,7 +249,6 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
249249
kind := dc.GetKind()
250250
role := dc.GetRole()
251251
// project
252-
curve_root := LAYOUT_CURVEFS_ROOT_DIR
253252
root := utils.Choose(kind == KIND_CURVEBS, LAYOUT_CURVEBS_ROOT_DIR, LAYOUT_DINGOFS_ROOT_DIR)
254253

255254
// service
@@ -265,14 +264,12 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
265264
})
266265
}
267266

268-
// tools, keep 'curvefs' as root dir
269-
toolsRootDir := curve_root + LAYOUT_TOOLS_DIR
267+
// tools, change 'dingofs' as root dir
268+
toolsRootDir := root + LAYOUT_TOOLS_DIR
270269
toolsBinDir := toolsRootDir + LAYOUT_SERVICE_BIN_DIR
271270
toolsConfDir := toolsRootDir + LAYOUT_SERVICE_CONF_DIR
272271
toolsBinaryName := utils.Choose(kind == KIND_CURVEBS, BINARY_CURVEBS_TOOL, BINARY_CURVEFS_TOOL)
273-
toolsConfSystemPath := utils.Choose(kind == KIND_CURVEBS,
274-
LAYOUT_CURVEBS_TOOLS_CONFIG_SYSTEM_PATH,
275-
LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH)
272+
toolsConfSystemPath := LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH
276273

277274
// tools-v2
278275
toolsV2RootDir := root + LAYOUT_TOOLS_V2_DIR

‎internal/configure/topology/dc_item.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636
// default value
3737
DEFAULT_REPORT_USAGE = true
3838
DEFAULT_CURVEBS_CONTAINER_IMAGE = "opencurvedocker/curvebs:latest"
39-
DEFAULT_CURVEFS_CONTAINER_IMAGE = "opencurvedocker/curvefs:latest"
39+
DEFAULT_CURVEFS_CONTAINER_IMAGE = "dingodatabase/dingofs:latest"
4040
DEFAULT_ETCD_LISTEN_PEER_PORT = 2380
4141
DEFAULT_ETCD_LISTEN_CLIENT_PORT = 2379
4242
DEFAULT_MDS_LISTEN_PORT = 6700

‎internal/playbook/tasks/tasks.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ func (ts *Tasks) setMainBarStatus() {
191191

192192
/*
193193
* Pull Image: [ERROR]
194-
* + host=10.0.0.1 image=opencurvedocker/curvefs [1/1] [OK]
195-
* + host=10.0.0.2 image=opencurvedocker/curvefs [1/2] [OK]
196-
* + host=10.0.0.3 image=opencurvedocker/curvefs [1/10] [ERROR]
197-
* + host=10.0.0.1 image=opencurvedocker/curvefs [10/10] [OK]
198-
* + host=10.0.0.2 image=opencurvedocker/curvefs [10/10] [OK]
199-
* + host=10.0.0.3 image=opencurvedocker/curvefs [1/10] [OK]
194+
* + host=10.0.0.1 image=dingodatabase/dingofs [1/1] [OK]
195+
* + host=10.0.0.2 image=dingodatabase/dingofs [1/2] [OK]
196+
* + host=10.0.0.3 image=dingodatabase/dingofs [1/10] [ERROR]
197+
* + host=10.0.0.1 image=dingodatabase/dingofs [10/10] [OK]
198+
* + host=10.0.0.2 image=dingodatabase/dingofs [10/10] [OK]
199+
* + host=10.0.0.3 image=dingodatabase/dingofs [1/10] [OK]
200200
*/
201201
func (ts *Tasks) Execute(option ExecOptions) error {
202202
if len(ts.tasks) == 0 {

‎internal/task/scripts/shell/wait.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ while ((wait<30))
1212
do
1313
for addr in "$@"
1414
do
15-
echo "connect [$addr]..." >> /curvefs/tools/logs/wait.log
15+
echo "connect [$addr]..." >> /dingofs/tools/logs/wait.log
1616
# curl --connect-timeout 3 --max-time 10 $addr -Iso /dev/null
1717
curl -sfI --connect-timeout 3 --max-time 5 "$addr" > /dev/null 2>&1
1818
if [ $? == 0 ]; then
19-
echo "connect [$addr] success !" >> /curvefs/tools/logs/wait.log
19+
echo "connect [$addr] success !" >> /dingofs/tools/logs/wait.log
2020
exit 0
2121
fi
2222
done
2323
sleep 1s
2424
wait=$(expr $wait + 1)
25-
date >> /curvefs/tools/logs/wait.log
25+
date >> /dingofs/tools/logs/wait.log
2626
done
2727
echo "wait timeout"
2828
exit 1

0 commit comments

Comments
 (0)