diff --git a/docker/s3tests/test_copy_object.py b/docker/s3tests/test_copy_object.py index d53efcdfa..a6e5fa46f 100644 --- a/docker/s3tests/test_copy_object.py +++ b/docker/s3tests/test_copy_object.py @@ -1,4 +1,4 @@ -# Copyright 2020 The ChubaoFS Authors. +# Copyright 2020 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. diff --git a/docker/s3tests/test_signature.py b/docker/s3tests/test_signature.py index e7ded26b4..a3bcbca4c 100644 --- a/docker/s3tests/test_signature.py +++ b/docker/s3tests/test_signature.py @@ -1,4 +1,4 @@ -# Copyright 2020 The ChubaoFS Authors. +# Copyright 2020 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. diff --git a/docker/script/build.sh b/docker/script/build.sh index 6025f9a78..41b11d5a5 100644 --- a/docker/script/build.sh +++ b/docker/script/build.sh @@ -4,7 +4,7 @@ failed=0 export GO111MODULE=off -echo -n 'Building ChubaoFS Server ... '; +echo -n 'Building CubeFS Server ... '; cd /go/src/github.com/cubefs/cubefs/cmd; bash ./build.sh &>> /tmp/cfs_build_output if [[ $? -eq 0 ]]; then @@ -16,7 +16,7 @@ else fi -echo -n 'Building ChubaoFS Client ... ' ; +echo -n 'Building CubeFS Client ... ' ; cd /go/src/github.com/cubefs/cubefs/client; bash ./build.sh &>> /tmp/cfs_build_output if [[ $? -eq 0 ]]; then @@ -27,7 +27,7 @@ else failed=1 fi -echo -n 'Building ChubaoFS CLI ... '; +echo -n 'Building CubeFS CLI ... '; cd /go/src/github.com/cubefs/cubefs/cli; bash ./build.sh &>> /tmp/cfs_build_output; if [[ $? -eq 0 ]]; then @@ -38,7 +38,7 @@ else failed=1 fi -echo -n 'Building ChubaoFS libsdk ... '; +echo -n 'Building CubeFS libsdk ... '; cd /go/src/github.com/cubefs/cubefs/libsdk; bash ./build.sh &>> /tmp/cfs_build_output; if [[ $? -eq 0 ]]; then diff --git a/docs/source/user-guide/authnode.rst b/docs/source/user-guide/authnode.rst index b12d82d9d..cace9239a 100644 --- a/docs/source/user-guide/authnode.rst +++ b/docs/source/user-guide/authnode.rst @@ -1,7 +1,7 @@ Authnode ==================== -`Authnode` provides a general authentication & authorization service among `ChubaoFS` nodes. `Client`, `Master`, `Meta` and `Data` node are required to be authenticated and authorized before any resource access in another node. +`Authnode` provides a general authentication & authorization service among `CubeFS` nodes. `Client`, `Master`, `Meta` and `Data` node are required to be authenticated and authorized before any resource access in another node. Initially, each node (`Auth`, `Client`, `Master`, `Meta` or `Data` node) is launched with a secure key which is distributed by a authenticated person (for instance, cluster admin). With a valid key, a node can be identified in `Authnode` service and granted a ticket for resource access. @@ -47,7 +47,7 @@ Use the following commands to build client side tool for `Authnode`: .. code-block:: bash $ git clone http://github.com/cubefs/cubefs.git - $ cd chubaofs + $ cd cubefs $ make build If successful, the tool `cfs-authtool` can be found in `build/bin`. @@ -120,7 +120,7 @@ AuthNode Configurations } -Steps for Starting ChubaoFS with AuthNode +Steps for Starting CubeFS with AuthNode ------------------------------------------ Create Authnode key @@ -224,7 +224,7 @@ Create `admin` using `Authnode` ticket: "caps": "{\"API\":[\"*:*:*\"]}" } -Create key for ChubaoFS cluster +Create key for CubeFS cluster ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -310,9 +310,9 @@ Create key for ChubaoFS cluster enableHTTPS: will enable HTTPS if set true. -Start ChubaoFS cluster +Start CubeFS cluster ~~~~~~~~~~~~~~~~~~~~~~~ - Run the following to launch ChubaoFS cluster with `AuthNode` enabled: + Run the following to launch CubeFS cluster with `AuthNode` enabled: .. code-block:: bash diff --git a/docs/source/user-guide/cfs-grafana-dashboard.json b/docs/source/user-guide/cfs-grafana-dashboard.json index d73afb57c..805542039 100644 --- a/docs/source/user-guide/cfs-grafana-dashboard.json +++ b/docs/source/user-guide/cfs-grafana-dashboard.json @@ -12139,7 +12139,7 @@ ] }, "timezone": "", - "title": "chubaofs", + "title": "cubefs", "uid": "J8XJyOmZk", "version": 484 } diff --git a/docs/source/user-guide/datanode.rst b/docs/source/user-guide/datanode.rst index 809c3bc1f..c9b69ebb8 100644 --- a/docs/source/user-guide/datanode.rst +++ b/docs/source/user-guide/datanode.rst @@ -4,7 +4,7 @@ Data Subsystem How To Start DataNode --------------------- -Start a DataNode process by execute the server binary of ChubaoFS you built with ``-c`` argument and specify configuration file. At least 4 data nodes are required in respect to high availability. +Start a DataNode process by execute the server binary of CubeFS you built with ``-c`` argument and specify configuration file. At least 4 data nodes are required in respect to high availability. .. code-block:: bash diff --git a/docs/source/user-guide/docker.rst b/docs/source/user-guide/docker.rst index 6e5ef0380..3a2049566 100644 --- a/docs/source/user-guide/docker.rst +++ b/docs/source/user-guide/docker.rst @@ -1,9 +1,9 @@ Run Cluster on Docker ----------------------- -Under the docker directory, a helper tool called run_docker.sh is provided to run ChubaoFS with docker-compose. +Under the docker directory, a helper tool called run_docker.sh is provided to run CubeFS with docker-compose. -To start a minimal ChubaoFS cluster from scratch, note that **/data/disk** is arbitrary, and make sure there are at least 30G available space. +To start a minimal CubeFS cluster from scratch, note that **/data/disk** is arbitrary, and make sure there are at least 30G available space. .. code-block:: bash @@ -13,7 +13,7 @@ If client starts successfully, use `mount` command in client docker shell to che .. code-block:: bash - $ mount | grep chubaofs + $ mount | grep cubefs Open http://127.0.0.1:3000 in browser, login with `admin/123456` to view grafana monitor metrics. diff --git a/docs/source/user-guide/yum.rst b/docs/source/user-guide/yum.rst index 4080f7aef..5bdabfee7 100644 --- a/docs/source/user-guide/yum.rst +++ b/docs/source/user-guide/yum.rst @@ -1,11 +1,11 @@ Run Cluster by Yum Tools ========================= -Yum tools to run a ChubaoFS cluster for CentOS 7+ is provided. The list of RPM packages dependencies can be installed with: +Yum tools to run a CubeFS cluster for CentOS 7+ is provided. The list of RPM packages dependencies can be installed with: .. code-block:: bash - $ yum install http://storage.jd.com/chubaofsrpm/latest/cfs-install-latest-el7.x86_64.rpm + $ yum install https://ocs-cn-north1.heytapcs.com/cubefs/rpm/3.0.0/cfs-install-3.0.0-el7.x86_64.rpm $ cd /cfs/install $ tree -L 2 . @@ -26,7 +26,7 @@ Yum tools to run a ChubaoFS cluster for CentOS 7+ is provided. The list of RPM p ├── metanode.json.j2 └── objectnode.json.j2 -Set parameters of the ChubaoFS cluster in **iplist**. +Set parameters of the CubeFS cluster in **iplist**. - **[master]**, **[datanode]** , **[metanode]** , **[console]**, **[monitor]** , **[client]** modules includes member IP addresses of each role. @@ -151,7 +151,7 @@ Set parameters of the ChubaoFS cluster in **iplist**. For more configurations, please refer to :doc:`master`; :doc:`metanode`; :doc:`datanode`; :doc:`client`; :doc:`monitor`; :doc:`console`. -Start the resources of ChubaoFS cluster with script **install.sh** . (make sure the Master is started first) +Start the resources of CubeFS cluster with script **install.sh** . (make sure the Master is started first) .. code-block:: bash diff --git a/libsdk/libsdk.go b/libsdk/libsdk.go index 42d162334..4a9762538 100644 --- a/libsdk/libsdk.go +++ b/libsdk/libsdk.go @@ -1,4 +1,4 @@ -// Copyright 2020 The ChubaoFS Authors. +// Copyright 2020 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. diff --git a/objectnode/etag.go b/objectnode/etag.go index 413941b40..ae0d85d89 100644 --- a/objectnode/etag.go +++ b/objectnode/etag.go @@ -1,4 +1,4 @@ -// Copyright 2020 The ChubaoFS Authors. +// Copyright 2020 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. diff --git a/objectnode/policy_action.go b/objectnode/policy_action.go index 5a757d7da..aa768fd0e 100644 --- a/objectnode/policy_action.go +++ b/objectnode/policy_action.go @@ -1,6 +1,6 @@ /* * MinIO Cloud Storage, (C) 2018 MinIO, Inc. - * Modifications copyright 2019 The ChubaoFS Authors. + * Modifications 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. diff --git a/test/userTest.sh b/test/userTest.sh index 5d643cdca..e4171fcec 100755 --- a/test/userTest.sh +++ b/test/userTest.sh @@ -606,7 +606,7 @@ check_msg "\"perm:builtin:ReadOnly\"" 45 mount_dir "user11" "test6" #sleep 1m df -h >return_Info.json -check_msg "chubaofs-test6 1.0G 0 1.0G 0% /cfs/mnt" 45 +check_msg "cubefs-test6 1.0G 0 1.0G 0% /cfs/mnt" 45 #check whether the permission is ReadOnly mkdir -p /cfs/mnt/a 2>return_Info.json check_msg "mkdir: cannot create directory ‘/cfs/mnt/a’: Read-only file system" 45 @@ -629,7 +629,7 @@ mount_dir "user13" "test7" #cat return_Info.json sleep 10s df -h >return_Info.json -check_msg "chubaofs-test7 1.0G 0 1.0G 0% /cfs/mnt" +check_msg "cubefs-test7 1.0G 0 1.0G 0% /cfs/mnt" mkdir -p /cfs/mnt/a ls -a /cfs/mnt >return_Info.json check_msg "a" 46 @@ -676,7 +676,7 @@ umount_dir #mount subdir mount_subdir "user16" "test10" "/a/b" df -h >return_Info.json -check_msg "chubaofs-test10 1.0G 0 1.0G 0% /cfs/mnt" 48 5 +check_msg "cubefs-test10 1.0G 0 1.0G 0% /cfs/mnt" 48 5 #check whether the permission is ReadOnly mkdir -p /cfs/mnt/a 2>return_Info.json check_msg "mkdir: cannot create directory ‘/cfs/mnt/a’: Read-only file system" 48 6 @@ -709,13 +709,13 @@ umount_dir #mount subdir mount_subdir "user490" "test49" "/a/b" df -h >return_Info.json -check_msg "chubaofs-test49 1.0G 0 1.0G 0% /cfs/mnt" 49 5 +check_msg "cubefs-test49 1.0G 0 1.0G 0% /cfs/mnt" 49 5 mkdir -p /cfs/mnt/c umount_dir #mount mount_subdir "user490" "test49" "/a/b/c" df -h >return_Info.json -check_msg "chubaofs-test49 1.0G 0 1.0G 0% /cfs/mnt" 49 6 +check_msg "cubefs-test49 1.0G 0 1.0G 0% /cfs/mnt" 49 6 umount_dir #clear subdir on vol mount_dir "user49" "test49" @@ -743,7 +743,7 @@ check_msg "\"perm:builtin:/e/f:/g/h:Writable\"" 50 4 #create subdir on vol mount_dir "user50" "test50" df -h>return_Info.json -check_msg "chubaofs-test50 1.0G 0 1.0G 0% /cfs/mnt" +check_msg "cubefs-test50 1.0G 0 1.0G 0% /cfs/mnt" mkdir -p /cfs/mnt/e/f mkdir -p /cfs/mnt/g/h #echo "first umount" @@ -751,20 +751,20 @@ umount_dir #mount subdir mount_subdir "user20" "test50" "/e/f" df -h >return_Info.json -check_msg "chubaofs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 5 +check_msg "cubefs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 5 #echo "second umount" umount_dir mount_subdir "user20" "test50" "/g/h" #cat /cfs/log/client/output.log sleep 5s df -h >return_Info.json -check_msg "chubaofs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 6 +check_msg "cubefs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 6 #echo "third umount" umount_dir #clear subdir on vol mount_dir "user50" "test50" df -h>return_Info.json -check_msg "chubaofs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 8 +check_msg "cubefs-test50 1.0G 0 1.0G 0% /cfs/mnt" 50 8 rm -rf /e rm -rf /g #echo "last umount" @@ -844,7 +844,7 @@ check_msg "\"test54\": \[" 54 3 check_msg "\"perm:builtin:Writable\"" 54 4 mount_dir "user540" "test54" df -h >return_Info.json -check_msg "chubaofs-test54 1.0G 0 1.0G 0% /cfs/mnt" +check_msg "cubefs-test54 1.0G 0 1.0G 0% /cfs/mnt" umount_dir #remove policy and check mount test_rmpolicy "user540" "test54" @@ -875,7 +875,7 @@ check_msg "success" 55 9 #mount the other one mount_dir "user550" "test55x" df -h >return_Info.json -check_msg "chubaofs-test55x 1.0G 0 1.0G 0% /cfs/mnt" 55 10 +check_msg "cubefs-test55x 1.0G 0 1.0G 0% /cfs/mnt" 55 10 umount_dir #delete two vol cal_md5 'user55' @@ -958,7 +958,7 @@ cat /cfs/log/client/output.log >return_Info.json check_msg "check permission failed: no permission" 61 7 mount_dir "user610" "test61" df -h >return_Info.json -check_msg "chubaofs-test61 1.0G 0 1.0G 0% /cfs/mnt" 61 9 +check_msg "cubefs-test61 1.0G 0 1.0G 0% /cfs/mnt" 61 9 umount_dir cal_md5 "user610" test_operation "/vol/delete?name=test61&authKey=$md5" @@ -978,7 +978,7 @@ check_msg "test62" 62 6 #check mount mount_dir "user62" "test62" df -h >return_Info.json -check_msg "chubaofs-test62 1.0G 0 1.0G 0% /cfs/mnt" 62 7 +check_msg "cubefs-test62 1.0G 0 1.0G 0% /cfs/mnt" 62 7 umount_dir cal_md5 'user620' test_operation "/vol/delete?name=test62&authKey=$md5"