CovenantSQL · auxten · Jan 21, 2019 · Dec 27, 2018 · Dec 27, 2018 · Jan 17, 2019
diff --git a/client/tx.go b/client/tx.go
@@ -21,6 +21,8 @@ import (
 	"context"
 	"database/sql"
 	"database/sql/driver"
+
+	"github.com/pkg/errors"
 )
 
 // ExecuteTx starts a transaction, and runs fn in it
@@ -39,11 +41,11 @@ func ExecuteTx(
 func ExecuteInTx(tx driver.Tx, fn func() error) (err error) {
 	err = fn()
 	if err == nil {
-		// Ignore commit errors. The tx has already been committed by RELEASE.
 		err = tx.Commit()
+		if err != nil {
+			err = errors.Wrapf(err, "exec in tx")
+		}
 	} else {
-		// We always need to execute a Rollback() so sql.DB releases the
-		// connection.
 		_ = tx.Rollback()
 	}
 	return

diff --git a/cmd/cql-fuse/block.go b/cmd/cql-fuse/block.go
@@ -40,7 +40,7 @@ import (
 
 // BlockSize is the size of each data block. It must not
 // change throughout the lifetime of the filesystem.
-const BlockSize = 4 << 10 // 4KB
+const BlockSize = 128 << 10 // 128KB
 
 func min(a, b uint64) uint64 {
 	if a < b {

diff --git a/cmd/cql-fuse/block_test.go b/cmd/cql-fuse/block_test.go
@@ -423,6 +423,9 @@ func TestShrinkGrow(t *testing.T) {
 	if data, err = tryGrow(db, data, id, BlockSize*5); err != nil {
 		log.Fatal(err)
 	}
+	if data, err = tryGrow(db, data, id, BlockSize*999); err != nil {
+		log.Fatal(err)
+	}
 
 	// Shrink it down to 0.
 	if data, err = tryShrink(db, data, id, 0); err != nil {

diff --git a/cmd/cql-fuse/main.go b/cmd/cql-fuse/main.go
@@ -80,18 +80,24 @@ import (
 )
 
 var usage = func() {
-	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-	fmt.Fprintf(os.Stderr, "  %s -config <config> -dsn <dsn> -mount <mountpoint>\n\n", os.Args[0])
+	_, _ = fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	_, _ = fmt.Fprintf(os.Stderr, "  %s -config <config> -dsn <dsn> -mount <mountpoint>\n\n", os.Args[0])
 	flag.PrintDefaults()
 }
 
 func main() {
-	var config, dsn, mountPoint, password string
-
+	var (
+		config     string
+		dsn        string
+		mountPoint string
+		password   string
+		readOnly   bool
+	)
 	flag.StringVar(&config, "config", "./conf/config.yaml", "config file path")
 	flag.StringVar(&mountPoint, "mount", "./", "dir to mount")
 	flag.StringVar(&dsn, "dsn", "", "database url")
 	flag.StringVar(&password, "password", "", "master key password for covenantsql")
+	flag.BoolVar(&readOnly, "readonly", false, "mount read only volume")
 	flag.Usage = usage
 	flag.Parse()
 
@@ -102,11 +108,12 @@ func main() {
 		log.Fatal(err)
 	}
 
+	cfg, err := client.ParseDSN(dsn)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	db, err := sql.Open("covenantsql", dsn)
+	db, err := sql.Open("covenantsql", cfg.FormatDSN())
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -118,13 +125,18 @@ func main() {
 	}
 
 	cfs := CFS{db}
+	opts := make([]fuse.MountOption, 0, 5)
+	opts = append(opts, fuse.FSName("CovenantFS"))
+	opts = append(opts, fuse.Subtype("CovenantFS"))
+	opts = append(opts, fuse.LocalVolume())
+	opts = append(opts, fuse.VolumeName(cfg.DatabaseID))
+	if readOnly {
+		opts = append(opts, fuse.ReadOnly())
+	}
 	// Mount filesystem.
 	c, err := fuse.Mount(
 		mountPoint,
-		fuse.FSName("CovenantFS"),
-		fuse.Subtype("CovenantFS"),
-		fuse.LocalVolume(),
-		fuse.VolumeName(""),
+		opts...,
 	)
 	if err != nil {
 		log.Fatal(err)

diff --git a/genMarshalHash.sh b/genMarshalHash.sh
@@ -2,10 +2,8 @@
 
 PROJECT_DIR=$(cd $(dirname $0)/; pwd)
 
-if [[ -x hsp ]]; then
-    echo "install HashStablePack cmd: hsp"
-    go get -u github.com/CovenantSQL/HashStablePack/hsp
-fi
+echo "install HashStablePack cmd: hsp"
+go get -v -u github.com/CovenantSQL/HashStablePack/hsp
 
 echo ${PROJECT_DIR}
 

diff --git a/test/fuse/node_miner_0/config.yaml b/test/fuse/node_miner_0/config.yaml
@@ -37,7 +37,7 @@ BlockProducer:
 Miner:
   IsTestMode: true
   RootDir: "./data"
-  MaxReqTimeGap: "2s"
+  MaxReqTimeGap: "60s"
   ProvideServiceInterval: "3s"
 KnownNodes:
 - ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9

diff --git a/test/fuse/node_miner_1/config.yaml b/test/fuse/node_miner_1/config.yaml
@@ -37,7 +37,7 @@ BlockProducer:
 Miner:
   IsTestMode: true
   RootDir: "./data"
-  MaxReqTimeGap: "2s"
+  MaxReqTimeGap: "60s"
   ProvideServiceInterval: "3s"
 KnownNodes:
 - ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9

diff --git a/test/fuse/node_miner_2/config.yaml b/test/fuse/node_miner_2/config.yaml
@@ -37,7 +37,7 @@ BlockProducer:
 Miner:
   IsTestMode: true
   RootDir: "./data"
-  MaxReqTimeGap: "2s"
+  MaxReqTimeGap: "60s"
   ProvideServiceInterval: "3s"
 KnownNodes:
 - ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9