rename repo from cfs to chubaofs

shijiesun · Apr 28, 2019 · 97f2a18 · 97f2a18
1 parent 803030a
commit 97f2a18
Show file tree

Hide file tree

Showing 116 changed files with 327 additions and 313 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ go:
   - 1.12
 
 env:
-  - CFS_BUILD_BASE="chubaofs/cfs-build:1.0"
+  - ChubaoFS_BUILD_BASE="chubaofs/chubaofs-build:1.0"
 
 services: docker
 
@@ -14,8 +14,8 @@ notifications:
   on_failure: never
 
 before_install:
-  - docker pull ${CFS_BUILD_BASE}
+  - docker pull ${ChubaoFS_BUILD_BASE}
 
 script:
-  - docker run --rm -v `pwd`:/go/src/github.com/chubaofs/cfs ${CFS_BUILD_BASE} /bin/bash -c "cd /go/src/github.com/chubaofs/cfs && make build"
+  - docker run --rm -v `pwd`:/go/src/github.com/chubaofs/cfs ${ChubaoFS_BUILD_BASE} /bin/bash -c "cd /go/src/github.com/chubaofs/chubaofs && make build"
 
diff --git a/README.md b/README.md
@@ -12,13 +12,13 @@ ChubaoFS (储宝文件系统) is a distributed file system with the following fe
 
 * POSIX-compatible
 
-For more details, please refer to our SIGMOD 2019 paper "CFS: A Distributed File System for Large Scale Container Platforms".
+For more details, please refer to our SIGMOD 2019 paper "ChubaoFS: A Distributed File System for Large Scale Container Platforms".
 
 
 ## Document
-https://cfs.readthedocs.io/en/latest/
+https://chubaofs.readthedocs.io/en/latest/
 
-https://cfs.readthedocs.io/zh_CN/latest/
+https://chubaofs.readthedocs.io/zh_CN/latest/
 
 ## License
 

diff --git a/client/fs/const.go b/client/fs/const.go
@@ -20,7 +20,7 @@ import (
 
 	"bazil.org/fuse"
 
-	"github.com/chubaofs/cfs/proto"
+	"github.com/chubaofs/chubaofs/proto"
 )
 
 const (

diff --git a/client/fs/dir.go b/client/fs/dir.go
@@ -23,8 +23,8 @@ import (
 	"bazil.org/fuse/fs"
 	"golang.org/x/net/context"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 // Dir defines the structure of a directory

diff --git a/client/fs/file.go b/client/fs/file.go
@@ -23,8 +23,8 @@ import (
 	"bazil.org/fuse/fs"
 	"golang.org/x/net/context"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/log"
 	"sync"
 )
 

diff --git a/client/fs/inode.go b/client/fs/inode.go
@@ -21,8 +21,8 @@ import (
 
 	"bazil.org/fuse"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 const (

diff --git a/client/fs/super.go b/client/fs/super.go
@@ -23,9 +23,9 @@ import (
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	"github.com/chubaofs/cfs/sdk/data/stream"
-	"github.com/chubaofs/cfs/sdk/meta"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/sdk/data/stream"
+	"github.com/chubaofs/chubaofs/sdk/meta"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 // Super defines the struct of a super block.

diff --git a/client/fuse.go b/client/fuse.go
@@ -34,10 +34,10 @@ import (
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	cfs "github.com/chubaofs/cfs/client/fs"
-	"github.com/chubaofs/cfs/util/config"
-	"github.com/chubaofs/cfs/util/exporter"
-	"github.com/chubaofs/cfs/util/log"
+	cfs "github.com/chubaofs/chubaofs/client/fs"
+	"github.com/chubaofs/chubaofs/util/config"
+	"github.com/chubaofs/chubaofs/util/exporter"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 const (
@@ -67,7 +67,7 @@ func main() {
 	flag.Parse()
 
 	if *configVersion {
-		fmt.Printf("CFS client verson: %s\n", Version)
+		fmt.Printf("ChubaoFS client verson: %s\n", Version)
 		os.Exit(0)
 	}
 
@@ -118,9 +118,9 @@ func Mount(cfg *config.Config) (err error) {
 		fuse.MaxReadahead(MaxReadAhead),
 		fuse.AsyncRead(),
 		fuse.AutoInvalData(autoInvalData),
-		fuse.FSName("cfs-"+volname),
+		fuse.FSName("chubaofs-"+volname),
 		fuse.LocalVolume(),
-		fuse.VolumeName("cfs-"+volname))
+		fuse.VolumeName("chubaofs-"+volname))
 
 	if err != nil {
 		return err

diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -17,14 +17,14 @@ package main
 import (
 	"strings"
 
-	"github.com/chubaofs/cfs/datanode"
-	"github.com/chubaofs/cfs/master"
-	"github.com/chubaofs/cfs/metanode"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/datanode"
+	"github.com/chubaofs/chubaofs/master"
+	"github.com/chubaofs/chubaofs/metanode"
+	"github.com/chubaofs/chubaofs/util/log"
 
 	"flag"
 	"fmt"
-	"github.com/chubaofs/cfs/util/config"
+	"github.com/chubaofs/chubaofs/util/config"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -112,7 +112,7 @@ func main() {
 	flag.Parse()
 
 	if *configVersion {
-		fmt.Printf("CFS server version: %s\n", Version)
+		fmt.Printf("ChubaoFS server version: %s\n", Version)
 		os.Exit(0)
 	}
 
@@ -121,7 +121,7 @@ func main() {
 		panic(err.Error())
 	}
 
-	log.LogInfof("Hello, CFS Storage, Current Version: %s", Version)
+	log.LogInfof("Hello, ChubaoFS Storage, Current Version: %s", Version)
 	cfg := config.LoadConfigFile(*configFile)
 	role := cfg.GetString(ConfigKeyRole)
 	logDir := cfg.GetString(ConfigKeyLogDir)

diff --git a/datanode/data_partition_repair.go b/datanode/data_partition_repair.go
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"fmt"
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
+	"github.com/chubaofs/chubaofs/util/log"
 	"github.com/juju/errors"
 	"hash/crc32"
 )

diff --git a/datanode/disk.go b/datanode/disk.go
@@ -26,8 +26,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 var (

diff --git a/datanode/partition.go b/datanode/partition.go
@@ -26,12 +26,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/chubaofs/cfs/master"
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/raftstore"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/master"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/raftstore"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
+	"github.com/chubaofs/chubaofs/util/log"
 	"github.com/juju/errors"
 	raftProto "github.com/tiglabs/raft/proto"
 	"hash/crc32"

diff --git a/datanode/partition_op_by_raft.go b/datanode/partition_op_by_raft.go
@@ -21,10 +21,10 @@ import (
 	"net"
 
 	"fmt"
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
+	"github.com/chubaofs/chubaofs/util/log"
 	"strings"
 	"sync/atomic"
 )

diff --git a/datanode/partition_raft.go b/datanode/partition_raft.go
@@ -25,11 +25,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/raftstore"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/util/config"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/raftstore"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/util/config"
+	"github.com/chubaofs/chubaofs/util/log"
 	"github.com/juju/errors"
 	raftproto "github.com/tiglabs/raft/proto"
 )

diff --git a/datanode/partition_raftfsm.go b/datanode/partition_raftfsm.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/util/exporter"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/exporter"
+	"github.com/chubaofs/chubaofs/util/log"
 	"github.com/juju/errors"
 	"github.com/tiglabs/raft"
 	raftproto "github.com/tiglabs/raft/proto"

diff --git a/datanode/server.go b/datanode/server.go
@@ -28,13 +28,13 @@ import (
 	"time"
 
 	"errors"
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/raftstore"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/util"
-	"github.com/chubaofs/cfs/util/config"
-	"github.com/chubaofs/cfs/util/exporter"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/raftstore"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/util"
+	"github.com/chubaofs/chubaofs/util/config"
+	"github.com/chubaofs/chubaofs/util/exporter"
+	"github.com/chubaofs/chubaofs/util/log"
 	"os"
 	"syscall"
 )
@@ -50,7 +50,7 @@ var (
 )
 
 const (
-	DefaultRackName         = "cfs_rack1"
+	DefaultRackName         = "chubaofs_rack1"
 	DefaultRaftDir          = "raft"
 	DefaultRaftLogsToRetain = 20000 // Count of raft logs per data partition
 	DefaultDiskMaxErr       = 20

diff --git a/datanode/server_handler.go b/datanode/server_handler.go
@@ -20,8 +20,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/storage"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/storage"
 )
 
 func (s *DataNode) getDiskAPI(w http.ResponseWriter, r *http.Request) {

diff --git a/datanode/space_manager.go b/datanode/space_manager.go
@@ -21,9 +21,9 @@ import (
 
 	"os"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/raftstore"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/raftstore"
+	"github.com/chubaofs/chubaofs/util/log"
 )
 
 // SpaceManager manages the disk space.

diff --git a/datanode/wrap_operator.go b/datanode/wrap_operator.go
@@ -25,12 +25,12 @@ import (
 
 	"strings"
 
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
-	"github.com/chubaofs/cfs/util"
-	"github.com/chubaofs/cfs/util/exporter"
-	"github.com/chubaofs/cfs/util/log"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
+	"github.com/chubaofs/chubaofs/util"
+	"github.com/chubaofs/chubaofs/util/exporter"
+	"github.com/chubaofs/chubaofs/util/log"
 	"github.com/juju/errors"
 	"github.com/tiglabs/raft"
 	raftProto "github.com/tiglabs/raft/proto"

diff --git a/datanode/wrap_post.go b/datanode/wrap_post.go
@@ -15,9 +15,9 @@
 package datanode
 
 import (
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
 	"sync/atomic"
 )
 

diff --git a/datanode/wrap_prepare.go b/datanode/wrap_prepare.go
@@ -17,9 +17,9 @@ package datanode
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/chubaofs/cfs/proto"
-	"github.com/chubaofs/cfs/repl"
-	"github.com/chubaofs/cfs/storage"
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/repl"
+	"github.com/chubaofs/chubaofs/storage"
 	"github.com/juju/errors"
 	"hash/crc32"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"bazil.org/fuse"
-    	"github.com/chubaofs/cfs/proto"
+    	"github.com/chubaofs/chubaofs/proto"
     )
     const (
@@ Expand Down @@