From af123b80a204d5e12ada96e3ca0c95d67bb0e4e0 Mon Sep 17 00:00:00 2001 From: Alex Aizman Date: Wed, 17 Jan 2024 09:41:55 -0500 Subject: [PATCH] core: copy/transform data-mover vs owt * for now, always set dm.owt = owt-put (and not migrate-replicate, as implied) Signed-off-by: Alex Aizman --- ais/tgtimpl.go | 4 ++-- ais/tgtobj.go | 2 +- cmn/owt.go | 4 +--- xact/xs/tcb.go | 2 +- xact/xs/tcobjs.go | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ais/tgtimpl.go b/ais/tgtimpl.go index 9c467dca15b..579aa0f9d63 100644 --- a/ais/tgtimpl.go +++ b/ais/tgtimpl.go @@ -169,8 +169,8 @@ func (t *target) GetCold(ctx context.Context, lom *core.LOM, owt cmn.OWT) (errCo } default: // for cmn.OwtGet, see goi.getCold - debug.Assert(false, "owt", owt) - return http.StatusInternalServerError, errors.New("invalid OWT") + debug.Assert(false, owt.String()) + return http.StatusInternalServerError, errors.New("invalid " + owt.String()) } // 2. GET remote object and store it diff --git a/ais/tgtobj.go b/ais/tgtobj.go index 54752c2d897..c98381e5f0b 100644 --- a/ais/tgtobj.go +++ b/ais/tgtobj.go @@ -1379,7 +1379,7 @@ func (coi *copyOI) _reader(t *target, dm *bundle.DataMover, lom, dst *core.LOM) poi.cksumToUse = oah.Checksum() } switch { - case dm != nil && dm.OWT() != cmn.OwtNone: + case dm != nil: poi.owt = dm.OWT() default: poi.owt = cmn.OwtMigrateRepl diff --git a/cmn/owt.go b/cmn/owt.go index 1a05e966033..2041a6eeaf2 100644 --- a/cmn/owt.go +++ b/cmn/owt.go @@ -1,7 +1,7 @@ // Package cmn provides common constants, types, and utilities for AIS clients // and AIStore. /* - * Copyright (c) 2018-2021, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved. */ package cmn @@ -29,8 +29,6 @@ const ( OwtGetPrefetchLock // (used for maximum parallelism when prefetching) ) -const OwtNone = OWT(-1) - func (owt *OWT) FromS(s string) { n, err := strconv.Atoi(s) debug.AssertNoErr(err) diff --git a/xact/xs/tcb.go b/xact/xs/tcb.go index 273e9ba1c80..4885e5d4c15 100644 --- a/xact/xs/tcb.go +++ b/xact/xs/tcb.go @@ -104,7 +104,7 @@ func (p *tcbFactory) newDM(config *cmn.Config, uuid string, sizePDU int32) error Multiplier: config.TCB.SbundleMult, SizePDU: sizePDU, } - dm, err := bundle.NewDataMover(trname+"-"+uuid, p.xctn.recv, cmn.OwtNone /* pass via coi */, dmExtra) + dm, err := bundle.NewDataMover(trname+"-"+uuid, p.xctn.recv, cmn.OwtPut /* pass via coi */, dmExtra) if err != nil { return err } diff --git a/xact/xs/tcobjs.go b/xact/xs/tcobjs.go index a27ad6e4ef3..102c6687324 100644 --- a/xact/xs/tcobjs.go +++ b/xact/xs/tcobjs.go @@ -92,7 +92,7 @@ func (p *tcoFactory) Start() error { // apc.ActETLObjects (transform) generates arbitrary sizes where we use PDU-based transport sizePDU = memsys.DefaultBufSize } - if err := p.newDM(p.Args.UUID /*trname*/, r.recv, r.config, cmn.OwtNone, sizePDU); err != nil { + if err := p.newDM(p.Args.UUID /*trname*/, r.recv, r.config, cmn.OwtPut, sizePDU); err != nil { return err } if r.p.dm != nil {