mirror of
https://github.com/cubefs/cubefs.git
synced 2026-08-02 02:00:56 +00:00
docs. update to cubefs
Signed-off-by: leonrayang <chl696@sina.com>
This commit is contained in:
leonrayang
leonrayang
parent
9a6c4d25ce
commit
d5bb45ea49
@ -5,7 +5,7 @@ services:
|
||||
|
||||
before_install:
|
||||
- docker pull nginx:1.17.8
|
||||
- docker build -t chubaofs/cfs-base:1.2 -f docker/Dockerfile docker
|
||||
- docker build -t cubefs/cfs-base:1.2 -f docker/Dockerfile docker
|
||||
|
||||
script:
|
||||
- docker/run_docker.sh -t
|
||||
|
||||
@ -232,7 +232,7 @@ Please refer to the documentation for details,the content already updated.
|
||||
|
||||
### _**UPGRAGDE NOTICE**_
|
||||
|
||||
If your ChubaoFS version is v2.3.x or before, please refer to the UPGRADE NOTICE in v2.4.0 for upgrading steps. And also please make sure that your fuse client or objectnode version is equal to or older than the servers, i.e. master, metanode and datanode. In another word, newer versioned client can not be used in a cluster with older versioned servers.
|
||||
If your CubeFS version is v2.3.x or before, please refer to the UPGRADE NOTICE in v2.4.0 for upgrading steps. And also please make sure that your fuse client or objectnode version is equal to or older than the servers, i.e. master, metanode and datanode. In another word, newer versioned client can not be used in a cluster with older versioned servers.
|
||||
### Notice
|
||||
* this release mainly used to optimize datanode cpu usage
|
||||
|
||||
|
||||
2
LICENSE
2
LICENSE
@ -186,7 +186,7 @@
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [2018] [The Chubao Authors]
|
||||
Copyright [2018] [The CubeFS Authors]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2022 The ChubaoFS Authors.
|
||||
// Copyright 2022 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2022 The ChubaoFS Authors.
|
||||
// Copyright 2022 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2022 The ChubaoFS Authors.
|
||||
// Copyright 2022 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2022 The ChubaoFS Authors.
|
||||
// Copyright 2022 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
FROM ubuntu:focal
|
||||
|
||||
MAINTAINER chubaofs
|
||||
MAINTAINER cubefs
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ RUN chmod a+x /root/*.sh
|
||||
|
||||
#ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/thymeleaf-master.jar"]
|
||||
|
||||
# docker build --rm --tag arm64_gcc9_golang1_13_ubuntu_focal_chubaofs ./build/compile/arm64
|
||||
# docker run -v /root/arm64/chubaofs:/root/chubaofs arm64_gcc9_golang1_13_ubuntu_focal_chubaofs /root/buildcfs.sh
|
||||
# docker build --rm --tag arm64_gcc9_golang1_13_ubuntu_focal_cubefs ./build/compile/arm64
|
||||
# docker run -v /root/arm64/cubefs:/root/cubefs arm64_gcc9_golang1_13_ubuntu_focal_cubefs /root/buildcfs.sh
|
||||
|
||||
#
|
||||
@ -2,7 +2,7 @@
|
||||
source /etc/profile
|
||||
RootPath=/root
|
||||
cd $RootPath
|
||||
cd ./chubaofs
|
||||
cd ./cubefs
|
||||
export CPUTYPE=arm64_gcc9
|
||||
bash ./build.sh
|
||||
export CPUTYPE=
|
||||
@ -1,6 +1,6 @@
|
||||
FROM centos:7.5.1804
|
||||
|
||||
MAINTAINER chubaofs
|
||||
MAINTAINER cubefs
|
||||
|
||||
|
||||
|
||||
@ -60,8 +60,8 @@ RUN echo "export PATH=/usr/local/go/bin:/usr/local/ARM-toolchain/gcc-linaro-5.5.
|
||||
|
||||
|
||||
#CMD /root/buildcfs.sh
|
||||
# docker build --rm --tag arm64_gcc4_golang1_13_centos7_5_chubaofs ./build/compile/arm64/centos
|
||||
# docker build --rm --tag arm64_gcc4_golang1_13_centos7_5_cubefs ./build/compile/arm64/centos
|
||||
# make dist-clean
|
||||
# docker run -v /root/arm64/chubaofs:/root/chubaofs arm64_gcc4_golang1_13_centos7_5_chubaofs /root/buildcfs.sh
|
||||
# docker run -v /root/arm64/cubefs:/root/cubefs arm64_gcc4_golang1_13_centos7_5_cubefs /root/buildcfs.sh
|
||||
|
||||
#ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/thymeleaf-master.jar"]
|
||||
@ -2,7 +2,7 @@
|
||||
source /etc/profile
|
||||
RootPath=/root
|
||||
cd $RootPath
|
||||
cd ./chubaofs
|
||||
cd ./cubefs
|
||||
export CPUTYPE=arm64_gcc4
|
||||
bash ./build.sh
|
||||
export CPUTYPE=
|
||||
@ -1,7 +1,7 @@
|
||||
FROM ubuntu:14.04
|
||||
#FROM ubuntu:16.04
|
||||
|
||||
MAINTAINER chubaofs
|
||||
MAINTAINER cubefs
|
||||
|
||||
|
||||
|
||||
@ -43,5 +43,5 @@ RUN apt-get -y install ssh
|
||||
#ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/thymeleaf-master.jar"]
|
||||
|
||||
|
||||
# docker build --rm --tag arm64_gcc4_golang1_13_ubuntu_14_04_chubaofs ./build/compile/arm64/gcc4
|
||||
# docker run -v /root/arm64/chubaofs:/root/chubaofs arm64_gcc4_golang1_13_ubuntu_14_04_chubaofs /root/buildcfs.sh
|
||||
# docker build --rm --tag arm64_gcc4_golang1_13_ubuntu_14_04_cubefs ./build/compile/arm64/gcc4
|
||||
# docker run -v /root/arm64/cubefs:/root/cubefs arm64_gcc4_golang1_13_ubuntu_14_04_cubefs /root/buildcfs.sh
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
source /etc/profile
|
||||
RootPath=/root
|
||||
cd $RootPath
|
||||
cd ./chubaofs
|
||||
cd ./cubefs
|
||||
export CPUTYPE=arm64_gcc4
|
||||
bash ./build.sh
|
||||
export CPUTYPE=
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"masterAddr": [
|
||||
"master.chubao.io"
|
||||
"master.cube.io"
|
||||
]
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
version: 1.0
|
||||
|
||||
cluster:
|
||||
name: "chubaofs-test01"
|
||||
name: "cubefs-test01"
|
||||
version: "2.4.0"
|
||||
config:
|
||||
consulAddr: http://consul.chubaofs.com/register
|
||||
consulAddr: http://consul.cubefs.com/register
|
||||
logLevel: "info"
|
||||
logDir: /var/log/cfs
|
||||
warnLogDir: /var/log/cfs-warn
|
||||
@ -60,7 +60,7 @@ cluster:
|
||||
exporterPort: 9500
|
||||
enableHTTPS: "false"
|
||||
domains:
|
||||
- "object.chubao.io"
|
||||
- "object.cube.io"
|
||||
signatureIgnoredActions:
|
||||
- "action:oss:GetObjectXAttr"
|
||||
- "action:oss:PutObjectXAttr"
|
||||
@ -74,7 +74,7 @@ cluster:
|
||||
- role: console
|
||||
config:
|
||||
listen: "80"
|
||||
objectNodeDomain: "object.chubao.io"
|
||||
objectNodeDomain: "object.cube.io"
|
||||
- role: client
|
||||
config:
|
||||
mountPoint: /cfs/mnt
|
||||
|
||||
@ -37,7 +37,7 @@ var (
|
||||
defaultConfigData = []byte(`
|
||||
{
|
||||
"masterAddr": [
|
||||
"master.chubao.io"
|
||||
"master.cube.io"
|
||||
],
|
||||
"timeout": 60
|
||||
}
|
||||
|
||||
@ -102,7 +102,7 @@ var (
|
||||
GenClusterCfgCmd = &cobra.Command{
|
||||
Use: "gencfg",
|
||||
Short: "generate cfs cluster config",
|
||||
Long: `Generate chubaofs cluster json config files by yaml config`,
|
||||
Long: `Generate cubefs cluster json config files by yaml config`,
|
||||
Run: genCfgCmd,
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2018 The Chubao Authors.
|
||||
// Copyright 2018 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -90,7 +90,7 @@ const (
|
||||
DynamicUDSNameFormat = "/tmp/CubeFS-fdstore-%v.sock"
|
||||
DefaultUDSName = "/tmp/CubeFS-fdstore.sock"
|
||||
|
||||
DefaultLogPath = "/var/log/chubaofs"
|
||||
DefaultLogPath = "/var/log/cubefs"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@ -26,10 +26,10 @@ func TestServer(t *testing.T) {
|
||||
// "retainLogs":"20000",
|
||||
// "tickInterval":500,
|
||||
// "electionTick":6,
|
||||
// "logDir": "/tmp/chubaofs/Logs",
|
||||
// "walDir":"/tmp/chubaofs/raft",
|
||||
// "storeDir":"/tmp/chubaofs/rocksdbstore",
|
||||
// "clusterName":"chubaofs"
|
||||
// "logDir": "/tmp/cubefs/Logs",
|
||||
// "walDir":"/tmp/cubefs/raft",
|
||||
// "storeDir":"/tmp/cubefs/rocksdbstore",
|
||||
// "clusterName":"cubefs"
|
||||
// }`)
|
||||
|
||||
// mserver := master.NewServer()
|
||||
|
||||
@ -416,8 +416,8 @@ const (
|
||||
ContextHandleVersionV1 uint32 = 1
|
||||
ContextNodeVersion uint32 = ContextNodeVersionV1
|
||||
ContextHandleVersion uint32 = ContextHandleVersionV1
|
||||
NodeListFileName string = "/tmp/ChubaoFS-fuse-Nodes.list"
|
||||
HandleListFileName string = "/tmp/ChubaoFS-fuse-Handles.list"
|
||||
NodeListFileName string = "/tmp/CubeFS-fuse-Nodes.list"
|
||||
HandleListFileName string = "/tmp/CubeFS-fuse-Handles.list"
|
||||
)
|
||||
|
||||
func WriteVersion(file *os.File, version uint32) error {
|
||||
@ -824,7 +824,7 @@ func (s *Server) LoadFuseContext(fs FS, sockaddr string) error {
|
||||
|
||||
sn := s.node[ch.NodeID]
|
||||
if node, ok := sn.node.(NodeOpener); ok {
|
||||
// create streamers for chubaofs
|
||||
// create streamers for cubefs
|
||||
if hdl, err = node.Open(nil, nil, nil); err != nil {
|
||||
err = fmt.Errorf("LoadFuseContext: failed to open handle %v: %v\n", sn.inode, err)
|
||||
return err
|
||||
|
||||
@ -1357,7 +1357,7 @@ type Attr struct {
|
||||
Flags uint32 // chflags(2) flags (OS X only)
|
||||
BlockSize uint32 // preferred blocksize for filesystem I/O
|
||||
|
||||
ParentIno uint64 // for chubaofs's file only
|
||||
ParentIno uint64 // for cubefs's file only
|
||||
}
|
||||
|
||||
func (a Attr) String() string {
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
"192.168.0.12:17010",
|
||||
"192.168.0.13:17010"
|
||||
],
|
||||
"objectNodeDomain": "object.chubao.io",
|
||||
"objectNodeDomain": "object.cube.io",
|
||||
"monitor_addr": "http://192.168.0.102:9090",
|
||||
"dashboard_addr": "http://grafana.chubao.io",
|
||||
"dashboard_addr": "http://grafana.cube.io",
|
||||
"monitor_app": "cfs",
|
||||
"monitor_cluster": "chubaofs01"
|
||||
"monitor_cluster": "cubefs01"
|
||||
}
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
192.168.0.104 master.chubao.io
|
||||
192.168.0.104 object.chubao.io
|
||||
192.168.0.104 master.cube.io
|
||||
192.168.0.104 object.cube.io
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"clusterName": "chubaofs01",
|
||||
"clusterName": "cubefs01",
|
||||
"id": "1",
|
||||
"role": "master",
|
||||
"ip": "192.168.0.11",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"clusterName": "chubaofs01",
|
||||
"clusterName": "cubefs01",
|
||||
"id": "2",
|
||||
"role": "master",
|
||||
"ip": "192.168.0.12",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"clusterName": "chubaofs01",
|
||||
"clusterName": "cubefs01",
|
||||
"id": "3",
|
||||
"role": "master",
|
||||
"ip": "192.168.0.13",
|
||||
|
||||
@ -57,7 +57,7 @@ http {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name object.chubao.io ~^(?<bucket>.+)\.object\.chubao\.io$;
|
||||
server_name object.cube.io ~^(?<bucket>.+)\.object\.cube\.io$;
|
||||
charset utf-8;
|
||||
|
||||
location / {
|
||||
@ -77,7 +77,7 @@ http {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name console.chubao.io;
|
||||
server_name console.cube.io;
|
||||
charset utf-8;
|
||||
|
||||
location / {
|
||||
@ -95,7 +95,7 @@ http {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name grafana.chubao.io;
|
||||
server_name grafana.cube.io;
|
||||
charset utf-8;
|
||||
|
||||
location / {
|
||||
@ -113,7 +113,7 @@ http {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name prometheus.chubao.io;
|
||||
server_name prometheus.cube.io;
|
||||
charset utf-8;
|
||||
|
||||
location / {
|
||||
@ -131,7 +131,7 @@ http {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name master.chubao.io;
|
||||
server_name master.cube.io;
|
||||
charset utf-8;
|
||||
|
||||
location / {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
],
|
||||
"enableHTTPS": "false",
|
||||
"domains": [
|
||||
"object.chubao.io"
|
||||
"object.cube.io"
|
||||
],
|
||||
"signatureIgnoredActions": [
|
||||
"action:oss:GetObjectXAttr",
|
||||
|
||||
@ -510,7 +510,7 @@
|
||||
"#d44a3a"
|
||||
],
|
||||
"datasource": null,
|
||||
"description": "Chubaofs process start time of selected instance",
|
||||
"description": "CubeFS process start time of selected instance",
|
||||
"format": "dateTimeFromNow",
|
||||
"gauge": {
|
||||
"maxValue": 100,
|
||||
@ -6045,8 +6045,8 @@
|
||||
"allValue": null,
|
||||
"current": {
|
||||
"tags": [],
|
||||
"text": "chubaofs01",
|
||||
"value": "chubaofs01"
|
||||
"text": "cubefs01",
|
||||
"value": "cubefs01"
|
||||
},
|
||||
"datasource": "Prometheus",
|
||||
"definition": "label_values(up{app=\"$app\"}, cluster)",
|
||||
@ -6945,7 +6945,7 @@
|
||||
]
|
||||
},
|
||||
"timezone": "",
|
||||
"title": "ChubaoFS",
|
||||
"title": "CubeFS",
|
||||
"uid": "J8XJyOmZk1",
|
||||
"version": 1
|
||||
}
|
||||
@ -16,10 +16,10 @@
|
||||
|
||||
import os
|
||||
|
||||
MASTER = 'http://master.chubao.io'
|
||||
ENDPOINT = 'http://object.chubao.io'
|
||||
MASTER = 'http://master.cube.io'
|
||||
ENDPOINT = 'http://object.cube.io'
|
||||
ACCESS_KEY = '39bEF4RrAQgMj6RV'
|
||||
SECRET_KEY = 'TRL6o3JL16YOqvZGIohBDFTHZDEcFsyd'
|
||||
BUCKET = os.environ.get('BUCKET')
|
||||
USE_SSL = False
|
||||
REGION = 'chubaofs01'
|
||||
REGION = 'cubefs01'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2018 The Chubao Authors.
|
||||
# Copyright 2018 The CubeFS Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
MntPoint=/cfs/mnt
|
||||
mkdir -p /cfs/bin /cfs/log /cfs/mnt
|
||||
src_path=/go/src/github.com/chubaofs/cfs
|
||||
src_path=/go/src/github.com/cubefs/cfs
|
||||
cli=/cfs/bin/cfs-cli
|
||||
conf_path=/cfs/conf
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2018 The Chubao Authors.
|
||||
# Copyright 2018 The CubeFS Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
MntPoint=/cfs/mnt
|
||||
mkdir -p /cfs/bin /cfs/log /cfs/mnt
|
||||
src_path=/go/src/github.com/chubaofs/cfs
|
||||
src_path=/go/src/github.com/cubefs/cfs
|
||||
cli=/cfs/bin/cfs-cli
|
||||
conf_path=/cfs/conf
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
MntPoint=/cfs/mnt
|
||||
mkdir -p /cfs/bin /cfs/log /cfs/mnt
|
||||
src_path=/go/src/github.com/chubaofs/cfs
|
||||
src_path=/go/src/github.com/cubefs/cfs
|
||||
|
||||
Master1Addr="192.168.0.11:17010"
|
||||
LeaderAddr=""
|
||||
|
||||
@ -181,7 +181,7 @@ cp jna-5.4.0.jar $TRINO_HOME/plugin/iceberg
|
||||
### 缺少cfs-hadoop.jar
|
||||
|
||||
```java
|
||||
java.lang.RuntimeException: java.lang.ClassNotFoundException: Class io.chubaofs.CubeFSFileSystem not found
|
||||
java.lang.RuntimeException: java.lang.ClassNotFoundException: Class io.cubefs.CubeFSFileSystem not found
|
||||
at org.apache.hadoop.conf.Configuration.getClass(Configuration.java:2349)
|
||||
at org.apache.hadoop.fs.FileSystem.getFileSystemClass(FileSystem.java:2790)
|
||||
at org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:2810)
|
||||
|
||||
@ -17,7 +17,7 @@ cd docker
|
||||
## Run the java test program
|
||||
|
||||
```
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient ls <dirpath>
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient read <filepath>
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient write <filepath>
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.cube.fs.TestCfsClient ls <dirpath>
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.cube.fs.TestCfsClient read <filepath>
|
||||
java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.cube.fs.TestCfsClient write <filepath>
|
||||
```
|
||||
|
||||
@ -78,10 +78,10 @@ func createDefaultMasterServerForTest() *Server {
|
||||
"retainLogs":"20000",
|
||||
"tickInterval":500,
|
||||
"electionTick":6,
|
||||
"logDir": "/tmp/chubaofs/Logs",
|
||||
"logDir": "/tmp/cubefs/Logs",
|
||||
"logLevel":"DEBUG",
|
||||
"walDir":"/tmp/chubaofs/raft",
|
||||
"storeDir":"/tmp/chubaofs/rocksdbstore",
|
||||
"walDir":"/tmp/cubefs/raft",
|
||||
"storeDir":"/tmp/cubefs/rocksdbstore",
|
||||
"clusterName":"cubefs"
|
||||
}`
|
||||
|
||||
@ -193,7 +193,7 @@ func createMasterServer(cfgJSON string) (server *Server, err error) {
|
||||
level = log.ErrorLevel
|
||||
}
|
||||
if _, err = log.InitLog(logDir, "master", level, nil); err != nil {
|
||||
fmt.Println("Fatal: failed to start the chubaofs daemon - ", err)
|
||||
fmt.Println("Fatal: failed to start the cubefs daemon - ", err)
|
||||
return
|
||||
}
|
||||
if profPort != "" {
|
||||
|
||||
@ -72,7 +72,7 @@ func snapshotTest(t *testing.T) {
|
||||
s := &Server{}
|
||||
|
||||
var dbStore *raftstore.RocksDBStore
|
||||
dbStore, err = raftstore.NewRocksDBStore("/tmp/chubaofs/raft2", LRUCacheSize, WriteBufferSize)
|
||||
dbStore, err = raftstore.NewRocksDBStore("/tmp/cubefs/raft2", LRUCacheSize, WriteBufferSize)
|
||||
if err != nil {
|
||||
t.Fatalf("init rocks db store fail cause: %v", err)
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2019 The ChubaoFS Authors.
|
||||
// Copyright 2019 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -52,9 +52,9 @@ const (
|
||||
// Example:
|
||||
// {
|
||||
// "masterAddr":[
|
||||
// "master1.chubao.io",
|
||||
// "master2.chubao.io",
|
||||
// "master3.chubao.io"
|
||||
// "master1.cube.io",
|
||||
// "master2.cube.io",
|
||||
// "master3.cube.io"
|
||||
// ]
|
||||
// }
|
||||
configMasterAddr = proto.MasterAddr
|
||||
@ -75,10 +75,10 @@ const (
|
||||
// Example:
|
||||
// {
|
||||
// "domains": [
|
||||
// "object.chubao.io"
|
||||
// "object.cube.io"
|
||||
// ]
|
||||
// }
|
||||
// The configuration in the example will allow ObjectNode to automatically resolve "* .object.chubao.io".
|
||||
// The configuration in the example will allow ObjectNode to automatically resolve "* .object.cube.io".
|
||||
configDomains = "domains"
|
||||
|
||||
disabledActions = "disabledActions"
|
||||
|
||||
@ -19,8 +19,8 @@ import "testing"
|
||||
func TestWildcards_Parse(t *testing.T) {
|
||||
|
||||
var domains = []string{
|
||||
"object.chubao.io",
|
||||
"oss.chubao.io",
|
||||
"object.cube.io",
|
||||
"oss.cube.io",
|
||||
}
|
||||
|
||||
type expect struct {
|
||||
@ -34,15 +34,15 @@ func TestWildcards_Parse(t *testing.T) {
|
||||
}
|
||||
|
||||
var samples = []sample{
|
||||
{h: "object.chubao.io", e: expect{wildcard: false}},
|
||||
{h: "object.chubao.io:8080", e: expect{wildcard: false}},
|
||||
{h: "a.object.chubao.io", e: expect{wildcard: true, bucket: "a"}},
|
||||
{h: "a.b.object.chubao.io", e: expect{wildcard: true, bucket: "a.b"}},
|
||||
{h: "a_b.object.chubao.io", e: expect{wildcard: true, bucket: "a_b"}},
|
||||
{h: "a-bc.object.chubao.io", e: expect{wildcard: true, bucket: "a-bc"}},
|
||||
{h: "ab.object.chubao.io:8080", e: expect{wildcard: true, bucket: "ab"}},
|
||||
{h: ".oss.chubao.io:a", e: expect{wildcard: false}},
|
||||
{h: ".b-c_d.oss.chubao.io:a", e: expect{wildcard: false}},
|
||||
{h: "object.cube.io", e: expect{wildcard: false}},
|
||||
{h: "object.cube.io:8080", e: expect{wildcard: false}},
|
||||
{h: "a.object.cube.io", e: expect{wildcard: true, bucket: "a"}},
|
||||
{h: "a.b.object.cube.io", e: expect{wildcard: true, bucket: "a.b"}},
|
||||
{h: "a_b.object.cube.io", e: expect{wildcard: true, bucket: "a_b"}},
|
||||
{h: "a-bc.object.cube.io", e: expect{wildcard: true, bucket: "a-bc"}},
|
||||
{h: "ab.object.cube.io:8080", e: expect{wildcard: true, bucket: "ab"}},
|
||||
{h: ".oss.cube.io:a", e: expect{wildcard: false}},
|
||||
{h: ".b-c_d.oss.cube.io:a", e: expect{wildcard: false}},
|
||||
}
|
||||
|
||||
var ws Wildcards
|
||||
|
||||
@ -25,7 +25,7 @@ func main() {
|
||||
}
|
||||
|
||||
// Note that outPath1 and outPath2 should point to the same underlying file
|
||||
// in ChubaoFS but through different mount point.
|
||||
// in CubeFS but through different mount point.
|
||||
outPath1 := os.Args[1]
|
||||
outPath2 := os.Args[2]
|
||||
data := "aoifjiwjefojwofoiwenfowepojpjoipgnoirngo\n"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2018 The Chubao Authors.
|
||||
// Copyright 2018 The CubeFS Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
||||
@ -29,7 +29,7 @@ type request struct {
|
||||
}
|
||||
|
||||
var (
|
||||
ReqHeaderUA = fmt.Sprintf("chubaofs-sdk/%v (commit %v)", proto.Version, proto.CommitID)
|
||||
ReqHeaderUA = fmt.Sprintf("cubefs-sdk/%v (commit %v)", proto.Version, proto.CommitID)
|
||||
)
|
||||
|
||||
func (r *request) addParam(key, value string) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
