Merge pull request #2822 from openziti/db-du-options

Add --human-readable and --max-depth options to ziti ops db du Fixes #2821

.github/workflows/main.yml

@@ -196,7 +196,6 @@ jobs:
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git
           $(go env GOPATH)/bin/ziti-ci generate-build-info common/version/info_generated.go version
-          go test ./...
           pushd zititest && go mod tidy && go install ./... && popd
           go install -tags=all,tests ./...
 

common/outputz/units.go

@@ -0,0 +1,20 @@
+package outputz
+
+import "fmt"
+
+var units = []string{"B", "K", "M", "G", "T", "P"}
+
+func FormatBytes(val uint64) string {
+	var i int
+	var target uint64
+	for i = range units {
+		target = 1 << uint(10*(i+1))
+		if val < target {
+			break
+		}
+	}
+	if i > 0 {
+		return fmt.Sprintf("%0.2f%s", float64(val)/(float64(target)/1024), units[i])
+	}
+	return fmt.Sprintf("%dB", val)
+}

router/xlink_transport/xlink_split.go

@@ -130,12 +130,12 @@ func (self *splitImpl) Close() error {
 		self.droppedMsgMeter.Dispose()
 	}
 	var err, err2 error
-	if self.payloadCh != nil {
-		err = self.payloadCh.Close()
+	if ch := self.payloadCh; ch != nil {
+		err = ch.Close()
 	}
 
-	if self.ackCh != nil {
-		err2 = self.ackCh.Close()
+	if ch := self.ackCh; ch != nil {
+		err2 = ch.Close()
 	}
 	if err == nil {
 		return err2

ziti/cmd/database/du.go

@@ -19,11 +19,14 @@ package database
 import (
 	"fmt"
 	"github.com/openziti/storage/boltz"
+	"github.com/openziti/ziti/common/outputz"
 	"github.com/spf13/cobra"
 	"go.etcd.io/bbolt"
 )
 
 type DiskUsageAction struct {
+	humanReadable bool
+	outputDepth   uint32
 }
 
 func NewDiskUsageAction() *cobra.Command {
@@ -36,11 +39,14 @@ func NewDiskUsageAction() *cobra.Command {
 		RunE:  action.Run,
 	}
 
+	cmd.Flags().BoolVarP(&action.humanReadable, "human-readable", "H", false, "human readable sizes")
+	cmd.Flags().Uint32VarP(&action.outputDepth, "max-depth", "d", 0, "how many levels deep to output")
+
 	return cmd
 }
 
 // Run implements this command
-func (o *DiskUsageAction) Run(cmd *cobra.Command, args []string) error {
+func (self *DiskUsageAction) Run(cmd *cobra.Command, args []string) error {
 	srcOptions := *bbolt.DefaultOptions
 	srcOptions.ReadOnly = true
 
@@ -69,7 +75,7 @@ func (o *DiskUsageAction) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	root.calcSize()
-	root.dump()
+	root.dump(self.humanReadable, self.outputDepth, 1)
 
 	return nil
 }
@@ -87,12 +93,18 @@ func (self *sizeNode) calcSize() {
 	}
 }
 
-func (self *sizeNode) dump() {
+func (self *sizeNode) dump(humanReadable bool, maxDepth uint32, currentDepth uint32) {
 	for _, child := range self.children {
-		child.dump()
+		child.dump(humanReadable, maxDepth, currentDepth+1)
 	}
 
-	fmt.Printf("%v: %v\n", self.path, self.size)
+	if maxDepth == 0 || currentDepth <= maxDepth {
+		if humanReadable {
+			fmt.Printf("%v: %v\n", self.path, outputz.FormatBytes(self.size))
+		} else {
+			fmt.Printf("%v: %v\n", self.path, self.size)
+		}
+	}
 }
 
 type sizeVisitor struct {

zititest/zitilab/actions/edge/ctrl_init.go

@@ -48,7 +48,7 @@ func (init *raftInit) Execute(run model.Run) error {
 			return errors.Errorf("component %s is not a controller", c.Id)
 		}
 
-		tmpl := "set -o pipefail; %s agent cluster init %s %s default.admin 2>&1 | tee logs/controller.edge.init.log"
+		tmpl := "set -o pipefail; %s agent cluster init --timeout 20s %s %s default.admin 2>&1 | tee logs/controller.edge.init.log"
 		if err := host.Exec(c.GetHost(), fmt.Sprintf(tmpl, ctrlType.GetBinaryPath(c), username, password)).Execute(run); err != nil {
 			return err
 		}