feature: enable go mod and update vendor

1. add chubaofs-blobstore client
 2. move origin modified vendor code to depends
    1) raft
    2) spf13
    3) fuse
    3) jacobsa
    4) rocksdb

Signed-off-by: leonrayang <chl696@sina.com>
This commit is contained in:
leonrayang 2022-02-11 11:10:25 +08:00 committed by Victor1319
parent d67f9fae02
commit 2a67ed4104
2609 changed files with 256991 additions and 160910 deletions

View File

@ -18,8 +18,8 @@ import (
"fmt"
"strings"
"github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft/proto"
)
// LeaderInfo represents the leader's information

View File

@ -20,8 +20,8 @@ import (
"strconv"
"strings"
"github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/raftstore"
"github.com/tiglabs/raft/proto"
)
//config key

View File

@ -22,11 +22,11 @@ import (
"strings"
"sync"
"github.com/cubefs/cubefs/depends/tiglabs/raft"
"github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/raftstore"
"github.com/cubefs/cubefs/util/keystore"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft"
"github.com/tiglabs/raft/proto"
)
const (

View File

@ -21,9 +21,9 @@ import (
"strconv"
"strings"
"github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/util/keystore"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft/proto"
)
// RaftCmd defines the Raft commands.

View File

@ -5,6 +5,8 @@ BuildPath=${RootPath}/build
BuildOutPath=${BuildPath}/out
BuildBinPath=${BuildPath}/bin
VendorPath=${RootPath}/vendor
DependsPath=${RootPath}/depends
RM=$(find /bin /sbin /usr/bin /usr/local -name "rm" | head -1)
if [[ "-x$RM" == "-x" ]] ; then
@ -138,7 +140,7 @@ build_lz4() {
build_snappy() {
SnappySrcPath=${VendorPath}/snappy-1.1.7
SnappySrcPath=${DependsPath}/snappy-1.1.7
SnappyBuildPath=${BuildOutPath}/snappy
found=$(find ${SnappyBuildPath} -name libsnappy.a 2>/dev/null | wc -l)
if [ ${found} -eq 0 ] ; then
@ -157,7 +159,7 @@ build_snappy() {
}
build_rocksdb() {
RocksdbSrcPath=${VendorPath}/rocksdb-5.9.2
RocksdbSrcPath=${DependsPath}/rocksdb-5.9.2
RocksdbBuildPath=${BuildOutPath}/rocksdb
found=$(find ${RocksdbBuildPath} -name librocksdb.a 2>/dev/null | wc -l)
if [ ${found} -eq 0 ] ; then
@ -165,11 +167,17 @@ build_rocksdb() {
mkdir -p ${RocksdbBuildPath}
cp -rf ${RocksdbSrcPath}/* ${RocksdbBuildPath}
fi
echo "build rocksdb..."
pushd ${RocksdbBuildPath} >/dev/null
[ "-$LUA_PATH" != "-" ] && unset LUA_PATH
CXXFLAGS='-Wno-error=deprecated-copy -Wno-error=class-memaccess -Wno-error=pessimizing-move' \
MAJOR=$(echo __GNUC__ | $(which gcc) -E -xc - | tail -n 1)
if [ ${MAJOR} -ge 10 ] ; then
CXXFLAGS='-Wno-error=deprecated-copy -Wno-error=class-memaccess -Wno-error=pessimizing-move' \
make -j ${NPROC} static_lib && echo "build rocksdb success" || { echo "build rocksdb failed" ; exit 1; }
else
make -j ${NPROC} static_lib && echo "build rocksdb success" || { echo "build rocksdb failed" ; exit 1; }
fi
popd >/dev/null
fi
cgo_cflags="${cgo_cflags} -I${RocksdbSrcPath}/include"
@ -181,7 +189,7 @@ build_rocksdb() {
}
init_gopath() {
export GO111MODULE=off
export GO111MODULE=on
export GOPATH=$HOME/tmp/cfs/go
mkdir -p $GOPATH/src/github.com/cubefs

View File

@ -18,7 +18,7 @@ import (
"syscall"
"time"
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/proto"
)

View File

@ -15,7 +15,7 @@
package fs
import (
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
func isDirectIOEnabled(flags fuse.OpenFlags) bool {

View File

@ -17,7 +17,7 @@ package fs
import (
"syscall"
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
func isDirectIOEnabled(flags fuse.OpenFlags) bool {

View File

@ -15,7 +15,7 @@
package fs
import (
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
func isDirectIOEnabled(flags fuse.OpenFlags) bool {

View File

@ -22,8 +22,8 @@ import (
"syscall"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"golang.org/x/net/context"
"github.com/cubefs/cubefs/proto"

View File

@ -19,8 +19,8 @@ import (
"io"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"golang.org/x/net/context"
"sync"

View File

@ -17,7 +17,7 @@ package fs
import (
"time"
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/util/log"

View File

@ -25,8 +25,8 @@ import (
"golang.org/x/net/context"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/sdk/data/stream"

View File

@ -43,9 +43,9 @@ import (
sysutil "github.com/cubefs/cubefs/util/sys"
"bazil.org/fuse"
"bazil.org/fuse/fs"
cfs "github.com/cubefs/cubefs/client/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/util/config"
"github.com/cubefs/cubefs/util/errors"

View File

@ -32,6 +32,7 @@ import (
"sort"
"syscall"
raftProto "github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/raftstore"
"github.com/cubefs/cubefs/repl"
@ -39,7 +40,6 @@ import (
"github.com/cubefs/cubefs/util/errors"
"github.com/cubefs/cubefs/util/exporter"
"github.com/cubefs/cubefs/util/log"
raftProto "github.com/tiglabs/raft/proto"
)
const (

View File

@ -19,12 +19,12 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"github.com/cubefs/cubefs/depends/tiglabs/raft"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/repl"
"github.com/cubefs/cubefs/storage"
"github.com/cubefs/cubefs/util/exporter"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft"
"net"
"strings"
)

View File

@ -27,13 +27,13 @@ import (
"sync/atomic"
"time"
raftproto "github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/raftstore"
"github.com/cubefs/cubefs/repl"
"github.com/cubefs/cubefs/util/config"
"github.com/cubefs/cubefs/util/errors"
"github.com/cubefs/cubefs/util/log"
raftproto "github.com/tiglabs/raft/proto"
)
type dataPartitionCfg struct {

View File

@ -22,12 +22,12 @@ import (
"sync/atomic"
"time"
"github.com/cubefs/cubefs/depends/tiglabs/raft"
raftproto "github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/storage"
"github.com/cubefs/cubefs/util/exporter"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft"
raftproto "github.com/tiglabs/raft/proto"
)
/* The functions below implement the interfaces defined in the raft library. */

View File

@ -40,7 +40,7 @@ import (
"github.com/cubefs/cubefs/util/exporter"
"github.com/cubefs/cubefs/util/log"
"smux"
"github.com/xtaci/smux"
)
var (

View File

@ -21,9 +21,9 @@ import (
"strconv"
"sync/atomic"
"github.com/cubefs/cubefs/depends/tiglabs/raft"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/storage"
"github.com/tiglabs/raft"
)
var (

View File

@ -26,6 +26,8 @@ import (
"hash/crc32"
"strings"
"github.com/cubefs/cubefs/depends/tiglabs/raft"
raftProto "github.com/cubefs/cubefs/depends/tiglabs/raft/proto"
"github.com/cubefs/cubefs/proto"
"github.com/cubefs/cubefs/repl"
"github.com/cubefs/cubefs/storage"
@ -33,8 +35,6 @@ import (
"github.com/cubefs/cubefs/util/errors"
"github.com/cubefs/cubefs/util/exporter"
"github.com/cubefs/cubefs/util/log"
"github.com/tiglabs/raft"
raftProto "github.com/tiglabs/raft/proto"
)
func (s *DataNode) getPacketTpLabels(p *repl.Packet) map[string]string {

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -11,10 +11,10 @@ import (
"syscall"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
_ "bazil.org/fuse/fs/fstestutil"
"bazil.org/fuse/fuseutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
_ "github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fuseutil"
"golang.org/x/net/context"
)

View File

@ -7,9 +7,9 @@ import (
"log"
"os"
"bazil.org/fuse"
"bazil.org/fuse/fs"
_ "bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
_ "github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/net/context"
)

View File

@ -5,9 +5,9 @@ import (
"os"
"testing"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/net/context"
)

View File

@ -6,9 +6,9 @@ import (
"golang.org/x/net/context"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
)
type benchLookupDir struct {

View File

@ -7,9 +7,9 @@ import (
"path"
"testing"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/net/context"
)

View File

@ -5,7 +5,7 @@ import (
"log"
"strconv"
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
type flagDebug bool

View File

@ -0,0 +1 @@
package fstestutil // import "github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"

View File

@ -8,8 +8,8 @@ import (
"testing"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
)
// Mount contains information about the mount for the test to use.

View File

@ -1,11 +1,11 @@
package record // import "bazil.org/fuse/fs/fstestutil/record"
package record // import "github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil/record"
import (
"sync"
"sync/atomic"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"golang.org/x/net/context"
)

View File

@ -4,8 +4,8 @@ import (
"sync"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"golang.org/x/net/context"
)

View File

@ -3,8 +3,8 @@ package fstestutil
import (
"os"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"golang.org/x/net/context"
)

View File

@ -1,6 +1,6 @@
// FUSE service loop, for servers that wish to use it.
package fs // import "bazil.org/fuse/fs"
package fs // import "github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
import (
"encoding/binary"
@ -19,8 +19,8 @@ import (
"bytes"
"bazil.org/fuse"
"bazil.org/fuse/fuseutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fuseutil"
"github.com/cubefs/cubefs/util"
"golang.org/x/net/context"
"golang.org/x/time/rate"

View File

@ -3,7 +3,7 @@ package fs_test
import (
"testing"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/sys/unix"
)

View File

@ -16,12 +16,12 @@ import (
"testing"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"bazil.org/fuse/fs/fstestutil/record"
"bazil.org/fuse/fuseutil"
"bazil.org/fuse/syscallx"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil/record"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fuseutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/syscallx"
"golang.org/x/net/context"
)

View File

@ -11,7 +11,7 @@ import (
)
import (
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
// A Tree implements a basic read-only directory tree for FUSE.

View File

@ -98,7 +98,7 @@
// Behavior and metadata of the mounted file system can be changed by
// passing MountOption values to Mount.
//
package fuse // import "bazil.org/fuse"
package fuse // import "github.com/cubefs/cubefs/depends/bazil.org/fuse"
import (
"bytes"

View File

@ -4,7 +4,7 @@ import (
"os"
"testing"
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
func TestOpenFlagsAccmodeMaskReadWrite(t *testing.T) {

View File

@ -1,7 +1,7 @@
package fuseutil // import "bazil.org/fuse/fuseutil"
package fuseutil // import "github.com/cubefs/cubefs/depends/bazil.org/fuse/fuseutil"
import (
"bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
)
// HandleRead handles a read request assuming that data is the entire file content.

View File

@ -11,9 +11,9 @@ import (
"testing"
"time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/net/context"
)

View File

@ -9,8 +9,8 @@ import (
"runtime"
"testing"
"bazil.org/fuse"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
)
func TestMountOptionCommaError(t *testing.T) {

View File

@ -6,9 +6,9 @@ import (
"syscall"
"testing"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"bazil.org/fuse/fs/fstestutil"
"github.com/cubefs/cubefs/depends/bazil.org/fuse"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs"
"github.com/cubefs/cubefs/depends/bazil.org/fuse/fs/fstestutil"
"golang.org/x/net/context"
)

View File

@ -10,4 +10,4 @@
//
// Options can be implemented with separate wrappers, in the style of
// Linux getxattr/lgetxattr/fgetxattr.
package syscallx // import "bazil.org/fuse/syscallx"
package syscallx // import "github.com/cubefs/cubefs/depends/bazil.org/fuse/syscallx"

Some files were not shown because too many files have changed in this diff Show More