NVIDIA
diff --git a/Collapse file
‎ais/ml.go‎
Copy file name to clipboard
+211-106Lines changed: 211 additions & 106 deletions b/Collapse file
‎ais/ml.go‎
Copy file name to clipboard
+211-106Lines changed: 211 additions & 106 deletions
diff --git a/Collapse file
‎ais/prxbsumm.go‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎ais/prxbsumm.go‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎ais/prxclu.go‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎ais/prxclu.go‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎ais/prxtxn.go‎
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/Collapse file
‎ais/prxtxn.go‎
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/Collapse file
‎ais/test/moss_test.go‎
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions b/Collapse file
‎ais/test/moss_test.go‎
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions
diff --git a/Collapse file
‎ais/tgtbck.go‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎ais/tgtbck.go‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file
‎ais/tgtcp.go‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎ais/tgtcp.go‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
@@ -56,7 +56,7 @@ func (p *proxy) bsummNew(qbck *cmn.QueryBcks, msg *apc.BsummCtrlMsg) (err error)
 	args := allocBcArgs()
 	args.req = cmn.HreqArgs{
 		Method: http.MethodGet,
-		Path:   apc.URLPathBuckets.Join(qbck.Name, apc.ActBegin), // compare w/ txn
+		Path:   apc.URLPathBuckets.Join(qbck.Name, apc.Begin2PC), // compare w/ txn
 		Query:  q,
 		Body:   cos.MustMarshal(actMsgExt),
 	}
@@ -91,7 +91,7 @@ func (p *proxy) bsummCollect(qbck *cmn.QueryBcks, msg *apc.BsummCtrlMsg) (_ cmn.
 	)
 	args.req = cmn.HreqArgs{
 		Method: http.MethodGet,
-		Path:   apc.URLPathBuckets.Join(qbck.Name, apc.ActQuery),
+		Path:   apc.URLPathBuckets.Join(qbck.Name, apc.Query2PC),
 		Body:   cos.MustMarshal(actMsgExt),
 	}
 	args.smap = p.owner.smap.get()
 
@@ -1820,7 +1820,7 @@ func (p *proxy) actBackend(w http.ResponseWriter, r *http.Request, tag string, u
 		return
 	}
 	// (two-phase commit)
-	for _, phase := range []string{apc.ActBegin, apc.ActCommit} {
+	for _, phase := range []string{apc.Begin2PC, apc.Commit2PC} {
 		var (
 			path string
 			args = allocBcArgs()
 
@@ -72,7 +72,7 @@ func (c *txnCln) init(msg *apc.ActMsg, bck *meta.Bck, config *cmn.Config, waitms
 }
 
 func (c *txnCln) begin(what fmt.Stringer) (err error) {
-	results := c.bcast(apc.ActBegin, c.timeout.netw)
+	results := c.bcast(apc.Begin2PC, c.timeout.netw)
 	for _, res := range results {
 		if res.err != nil {
 			err = res.toErr()
@@ -88,7 +88,7 @@ func (c *txnCln) begin(what fmt.Stringer) (err error) {
 // that can be run concurrently - comma-separated list of UUIDs
 func (c *txnCln) commit(what fmt.Stringer, timeout time.Duration) (xid string, all []string, err error) {
 	same4all := true
-	results := c.bcast(apc.ActCommit, timeout)
+	results := c.bcast(apc.Commit2PC, timeout)
 
 	for _, res := range results {
 		if res.err != nil {
@@ -134,7 +134,7 @@ func (c *txnCln) cmtTout(waitmsync bool) time.Duration {
 
 func (c *txnCln) bcast(phase string, timeout time.Duration) (results sliceResults) {
 	c.req.Path = cos.JoinWords(c.path, phase)
-	if phase != apc.ActAbort {
+	if phase != apc.Abort2PC {
 		now := time.Now()
 		c.req.Query.Set(apc.QparamUnixTime, cos.UnixNano2S(now.UnixNano()))
 	}
@@ -157,7 +157,7 @@ func (c *txnCln) bcast(phase string, timeout time.Duration) (results sliceResult
 
 func (c *txnCln) bcastAbort(what fmt.Stringer, err error) {
 	nlog.Errorf("Abort %q %s: %v %s", c.msg.Action, what, err, c.msg)
-	results := c.bcast(apc.ActAbort, 0)
+	results := c.bcast(apc.Abort2PC, 0)
 	freeBcastRes(results)
 }
 
@@ -986,7 +986,7 @@ func prmBegin(c *txnCln, bck *meta.Bck, singleT bool) (num int64, allAgree bool,
 	var cksumVal, totalN string
 	allAgree = !singleT
 
-	results := c.bcast(apc.ActBegin, c.timeout.netw)
+	results := c.bcast(apc.Begin2PC, c.timeout.netw)
 	for i, res := range results {
 		if res.err != nil {
 			err = res.toErr()
 
@@ -74,8 +74,6 @@ func (c *mossConfig) name() (s string) {
 }
 
 func TestMoss(t *testing.T) {
-	tools.CheckSkip(t, &tools.SkipTestArgs{MaxTargets: 1}) // TODO -- FIXME: remove
-
 	var (
 		numPlainObjs = 500 // plain objects to create
 		numArchives  = 400 // num shards to create
@@ -140,6 +138,14 @@ func TestMoss(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name(), func(t *testing.T) {
+			// TODO -- FIXME: remove when fixed multi-node
+			if test.outputFormat != "" && test.outputFormat != archive.ExtTar && test.outputFormat != archive.ExtZip {
+				smap := tools.GetClusterMap(t, tools.GetPrimaryURL())
+				if nt := smap.CountTargets(); nt > 1 {
+					t.Skipf("skipping %s: still need to fix multi-node (t=%d) for output format %q", test.name(), nt, test.outputFormat)
+				}
+			}
+
 			var (
 				bck = cmn.Bck{Name: trand.String(15), Provider: apc.AIS}
 				m   = ioContext{
@@ -263,7 +269,6 @@ func testMossArchives(t *testing.T, m *ioContext, test *mossConfig, numArchives,
 			}
 		}
 	}
-
 	if test.streaming {
 		testMossStreaming(t, m, test, mossIn)
 	} else {
@@ -480,10 +485,7 @@ func isMissingFile(mossIn *apc.MossIn) bool {
 		return true
 	}
 	// Missing archive paths have ".nonexistent" suffix
-	if mossIn.ArchPath != "" && strings.HasSuffix(mossIn.ArchPath, mossMissingSuffix) {
-		return true
-	}
-	return false
+	return mossIn.ArchPath != "" && strings.HasSuffix(mossIn.ArchPath, mossMissingSuffix)
 }
 
 func testMossStreaming(t *testing.T, m *ioContext, test *mossConfig, mossIn []apc.MossIn) {
@@ -692,6 +694,7 @@ func validateTarMultipartWithArchive(t *testing.T, req *apc.MossReq, resp apc.Mo
 			mossOut      = &resp.Out[i]
 			tarEntry     = &callback.entries[i]
 		)
+		// tlog.Logf("DEBUG: mossOut.Bucket = %q, ObjName = %q\n", mossOut.Bucket, mossOut.ObjName)
 
 		// Calculate expected name based on onlyObjName setting
 		if req.OnlyObjName {
 
@@ -125,7 +125,7 @@ func (t *target) httpbckget(w http.ResponseWriter, r *http.Request, dpq *dpq) {
 		} else {
 			bucket, phase = apiItems[0], apiItems[1]
 		}
-		if phase != apc.ActBegin && phase != apc.ActQuery {
+		if phase != apc.Begin2PC && phase != apc.Query2PC {
 			t.writeErrURL(w, r)
 			return
 		}
@@ -299,7 +299,7 @@ func (t *target) listObjects(w http.ResponseWriter, r *http.Request, bck *meta.B
 }
 
 func (t *target) bsumm(w http.ResponseWriter, r *http.Request, phase string, bck *meta.Bck, msg *apc.BsummCtrlMsg, dpq *dpq) {
-	if phase == apc.ActBegin {
+	if phase == apc.Begin2PC {
 		rns := xreg.RenewBckSummary(bck, msg)
 		if rns.Err != nil {
 			t.writeErr(w, r, rns.Err, http.StatusInternalServerError, Silent)
@@ -309,7 +309,7 @@ func (t *target) bsumm(w http.ResponseWriter, r *http.Request, phase string, bck
 		return
 	}
 
-	debug.Assert(phase == apc.ActQuery, phase)
+	debug.Assert(phase == apc.Query2PC, phase)
 	xctn, err := xreg.GetXact(msg.UUID) // vs. hk.OldAgeX removal
 	if err != nil {
 		t.writeErr(w, r, err, http.StatusInternalServerError)
 
@@ -285,7 +285,7 @@ func (t *target) daeputItems(w http.ResponseWriter, r *http.Request, apiItems []
 			t.writeErrf(w, r, "expecting cloud storage provider (have %q)", provider)
 			return
 		}
-		if phase != apc.ActBegin && phase != apc.ActCommit {
+		if phase != apc.Begin2PC && phase != apc.Commit2PC {
 			t.writeErrf(w, r, "expecting 'begin' or 'commit' phase (have %q)", phase)
 			return
 		}
@@ -314,7 +314,7 @@ func (t *target) enableBackend(w http.ResponseWriter, r *http.Request, provider,
 	switch {
 	case bp != nil:
 		t.writeErrf(w, r, "backend %q is already enabled, nothing to do", provider)
-	case phase == apc.ActBegin:
+	case phase == apc.Begin2PC:
 		nlog.Infof("ready to enable backend %q", provider)
 	default:
 		var err error
@@ -357,7 +357,7 @@ func (t *target) disableBackend(w http.ResponseWriter, r *http.Request, provider
 	switch {
 	case bp == nil:
 		t.writeErrf(w, r, "backend %q is already disabled, nothing to do", provider)
-	case phase == apc.ActBegin:
+	case phase == apc.Begin2PC:
 		nlog.Infof("ready to disable backend %q", provider)
 	default:
 		// NOTE: not locking bp := t.Backend()
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (p proxy) bsummNew(qbck cmn.QueryBcks, msg *apc.BsummCtrlMsg) (err error)`
`56`	`56`	`args := allocBcArgs()`
`57`	`57`	`args.req = cmn.HreqArgs{`
`58`	`58`	`Method: http.MethodGet,`
`59`		`- Path: apc.URLPathBuckets.Join(qbck.Name, apc.ActBegin), // compare w/ txn`
	`59`	`+ Path: apc.URLPathBuckets.Join(qbck.Name, apc.Begin2PC), // compare w/ txn`
`60`	`60`	`Query: q,`
`61`	`61`	`Body: cos.MustMarshal(actMsgExt),`
`62`	`62`	`}`
`@@ -91,7 +91,7 @@ func (p proxy) bsummCollect(qbck cmn.QueryBcks, msg *apc.BsummCtrlMsg) (_ cmn.`
`91`	`91`	`)`
`92`	`92`	`args.req = cmn.HreqArgs{`
`93`	`93`	`Method: http.MethodGet,`
`94`		`- Path: apc.URLPathBuckets.Join(qbck.Name, apc.ActQuery),`
	`94`	`+ Path: apc.URLPathBuckets.Join(qbck.Name, apc.Query2PC),`
`95`	`95`	`Body: cos.MustMarshal(actMsgExt),`
`96`	`96`	`}`
`97`	`97`	`args.smap = p.owner.smap.get()`
Original file line number	Diff line number	Diff line change
`@@ -1820,7 +1820,7 @@ func (p proxy) actBackend(w http.ResponseWriter, r http.Request, tag string, u`
`1820`	`1820`	`return`
`1821`	`1821`	`}`
`1822`	`1822`	`// (two-phase commit)`
`1823`		`- for _, phase := range []string{apc.ActBegin, apc.ActCommit} {`
	`1823`	`+ for _, phase := range []string{apc.Begin2PC, apc.Commit2PC} {`
`1824`	`1824`	`var (`
`1825`	`1825`	`path string`
`1826`	`1826`	`args = allocBcArgs()`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (t target) httpbckget(w http.ResponseWriter, r http.Request, dpq *dpq) {`
`125`	`125`	`} else {`
`126`	`126`	`bucket, phase = apiItems[0], apiItems[1]`
`127`	`127`	`}`
`128`		`- if phase != apc.ActBegin && phase != apc.ActQuery {`
	`128`	`+ if phase != apc.Begin2PC && phase != apc.Query2PC {`
`129`	`129`	`t.writeErrURL(w, r)`
`130`	`130`	`return`
`131`	`131`	`}`
`@@ -299,7 +299,7 @@ func (t target) listObjects(w http.ResponseWriter, r http.Request, bck *meta.B`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`func (t target) bsumm(w http.ResponseWriter, r http.Request, phase string, bck meta.Bck, msg apc.BsummCtrlMsg, dpq *dpq) {`
`302`		`- if phase == apc.ActBegin {`
	`302`	`+ if phase == apc.Begin2PC {`
`303`	`303`	`rns := xreg.RenewBckSummary(bck, msg)`
`304`	`304`	`if rns.Err != nil {`
`305`	`305`	`t.writeErr(w, r, rns.Err, http.StatusInternalServerError, Silent)`
`@@ -309,7 +309,7 @@ func (t target) bsumm(w http.ResponseWriter, r http.Request, phase string, bck`
`309`	`309`	`return`
`310`	`310`	`}`
`311`	`311`
`312`		`- debug.Assert(phase == apc.ActQuery, phase)`
	`312`	`+ debug.Assert(phase == apc.Query2PC, phase)`
`313`	`313`	`xctn, err := xreg.GetXact(msg.UUID) // vs. hk.OldAgeX removal`
`314`	`314`	`if err != nil {`
`315`	`315`	`t.writeErr(w, r, err, http.StatusInternalServerError)`