Allow size as a percent for torusd. Fixes #175

cmd/torusd/main.go

@@ -1,13 +1,18 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
 	"os/signal"
+	"path/filepath"
+	"strconv"
+	"strings"
 
 	"github.com/coreos/pkg/capnslog"
 	"github.com/dustin/go-humanize"
+	"github.com/ricochet2200/go-disk-usage/du"
 	"github.com/spf13/cobra"
 
 	"github.com/coreos/torus"
@@ -110,10 +115,29 @@ func configureServer(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(os.Stderr, "error parsing read-cache-size: %s\n", err)
 		os.Exit(1)
 	}
-	size, err = humanize.ParseBytes(sizeStr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error parsing size: %s\n", err)
-		os.Exit(1)
+	if strings.Contains(sizeStr, "%") {
+
+		percent, err := parsePercentage(sizeStr)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error parsing size: %s\n", err)
+			os.Exit(1)
+		}
+
+		directory := dataDir
+		if dataDir == "" {
+			directory, _ = os.Getwd()
+		} else {
+			directory, _ = filepath.Abs(dataDir)
+		}
+
+		size = du.NewDiskUsage(directory).Size() * percent / 100
+
+	} else {
+		size, err = humanize.ParseBytes(sizeStr)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error parsing size: %s\n", err)
+			os.Exit(1)
+		}
 	}
 
 	var rl torus.ReadLevel
@@ -151,6 +175,18 @@ func configureServer(cmd *cobra.Command, args []string) {
 	}
 }
 
+func parsePercentage(percentString string) (uint64, error) {
+	sizePercent := strings.Split(percentString, "%")[0]
+	sizeNumber, err := strconv.Atoi(sizePercent)
+	if err != nil {
+		return 0, err
+	}
+	if sizeNumber < 1 || sizeNumber > 100 {
+		return 0, errors.New("invalid size; must be between 1%% and 100%%\n")
+	}
+	return uint64(sizeNumber), nil
+}
+
 func runServer(cmd *cobra.Command, args []string) {
 
 	var (

glide.yaml

@@ -30,6 +30,7 @@ import:
 - package: github.com/prometheus/client_golang
   subpackages:
   - prometheus
+- package: github.com/ricochet2200/go-disk-usage
 - package: github.com/serialx/hashring
 - package: github.com/spf13/cobra
 - package: golang.org/x/net

local_server.go

@@ -42,6 +42,12 @@ func NewServer(cfg Config, metadataServiceKind, blockStoreKind string) (*Server,
 		return nil, err
 	}
 
+	offset := cfg.StorageSize % global.BlockSize
+	if offset != 0 {
+		cfg.StorageSize = cfg.StorageSize - offset
+		clog.Infof("resizing to %v bytes to make an even multiple of blocksize: %v\n", cfg.StorageSize, global.BlockSize)
+	}
+
 	blocks, err := CreateBlockStore(blockStoreKind, "current", cfg, global)
 	if err != nil {
 		return nil, err