Merge remote-tracking branch 'origin/master' into DAOS-4350

doc/man/man8/dmg.8

@@ -1,4 +1,4 @@
-.TH dmg 1 "30 March 2020"
+.TH dmg 1 "1 April 2020"
 .SH NAME
 dmg \- Administrative tool for managing DAOS clusters
 .SH SYNOPSIS
@@ -351,4 +351,26 @@ Query DAOS system status
 \fBAliases\fP: q
 
 .TP
-\fB\fB\-v\fR, \fB\-\-
+\fB\fB\-v\fR, \fB\-\-verbose\fR\fP
+Display more member details
+.TP
+\fB\fB\-r\fR, \fB\-\-ranks\fR\fP
+Comma separated list of system ranks to query
+.SS system start
+Perform start of stopped DAOS system
+
+\fBAliases\fP: r
+
+.SS system stop
+Perform controlled shutdown of DAOS system
+
+\fBUsage\fP: system stop [stop-OPTIONS]
+.TP
+
+\fBAliases\fP: s
+
+.TP
+\fB\fB\-\-force\fR\fP
+Force stop DAOS system members
+.SS version
+Print dmg version

src/SConscript

@@ -12,7 +12,7 @@ HEADERS_SRV = ['vos.h', 'vos_types.h']
 def scons():
     """Execute build"""
 
-    Import('env', 'prereqs')
+    Import('env')
 
     # For Common library (tse.h)
     env.AppendUnique(CPPPATH=[Dir('include/daos').srcnode()])

src/client/pydaos/__init__.py

@@ -86,7 +86,7 @@ def __del__(self):
 @atexit.register
 def _cleanup():
     global dc
-    dc = None;
+    dc = None
 
 from .pydaos_core import *
 

src/common/tests/checksum_tests.c

@@ -1081,7 +1081,7 @@ simple_sv(void **state)
 
 	iod.iod_nr = 1;
 	iod.iod_recxs = NULL;
-	iod.iod_size = 1; /* [todo-ryon]: this should be bigger than 1 */
+	iod.iod_size = daos_sgl_buf_size(&sgl);
 	iod.iod_type = DAOS_IOD_SINGLE;
 
 	rc = daos_csummer_calc_iods(csummer, &sgl, &iod, 1, 0, NULL, 0,

src/control/SConscript

@@ -140,6 +140,8 @@ def scons():
     gosrc = Dir('.').srcnode().abspath
     cartpath = Dir('#/src/cart/src/include').srcnode().abspath
 
+    denv.AppendENVPath("CGO_LDFLAGS",
+                       denv.subst("-L$BUILD_DIR/src/cart/src/gurt"))
     denv.AppendENVPath("CGO_CFLAGS", "-I%s" % cartpath, sep=" ")
 
     agentbin = install_go_bin(denv, gosrc, None, "agent", "daos_agent")
@@ -154,6 +156,8 @@ def scons():
     prereqs.require(senv, 'pmdk', 'spdk', 'ofi', 'hwloc')
 
     cgolibdirs = senv.subst("-L$BUILD_DIR/src/control/lib/spdk "
+                            "-L$BUILD_DIR/src/cart/src/gurt "
+                            "-L$BUILD_DIR/src/cart/src/cart "
                             "-L$PREFIX/lib64 -L$SPDK_PREFIX/lib "
                             "-L$HWLOC_PREFIX/lib -L$OFI_PREFIX/lib "
                             "-L$ISAL_PREFIX/lib $_RPATH")

src/control/cmd/dmg/man_test.go

@@ -23,7 +23,6 @@
 package main
 
 import (
-	"bufio"
 	"bytes"
 	"flag"
 	"fmt"
@@ -50,7 +49,7 @@ func TestDmg_ManPageIsCurrent(t *testing.T) {
 		return out.Bytes()
 	}
 
-	writeManPage(bufio.NewWriter(&manBytes))
+	writeManPage(&manBytes)
 	if *update {
 		err := ioutil.WriteFile(goldenPath, manBytes.Bytes(), 0644)
 		if err != nil {