UFS: add hostname into err msg of updating dut state
BUG=crbug.com/1156545
TEST=make test
Change-Id: I02a452d7986f27d019de12a0086d3cae3f4abaf4
Reviewed-on: https://chromium-review.googlesource.com/c/infra/infra/+/2634270
Reviewed-by: Eshwar Narayan <eshwarn@chromium.org>
Commit-Queue: Xixuan Wu <xixuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#37717}
diff --git a/go/src/infra/unifiedfleet/app/controller/asset.go b/go/src/infra/unifiedfleet/app/controller/asset.go
index d77495e..272d51d 100644
--- a/go/src/infra/unifiedfleet/app/controller/asset.go
+++ b/go/src/infra/unifiedfleet/app/controller/asset.go
@@ -446,16 +446,16 @@
f := func(ctx context.Context) error {
machine, err := registration.GetMachine(ctx, meta.GetChromeosDeviceId())
if err != nil {
- return errors.Annotate(err, "UpdateAssetMeta").Err()
+ return err
}
if machine.GetChromeosMachine() == nil {
- logging.Warningf(ctx, "UpdateAssetMeta - %s is not a valid Chromeos machine", meta.GetChromeosDeviceId())
+ logging.Warningf(ctx, "%s is not a valid Chromeos machine", meta.GetChromeosDeviceId())
return nil
}
asset, err := registration.GetAsset(ctx, meta.GetChromeosDeviceId())
if err != nil {
- return errors.Annotate(err, "UpdateAssetMeta").Err()
+ return err
}
hc := &HistoryClient{}
// Copy for logging
@@ -483,7 +483,7 @@
}
if err := datastore.RunInTransaction(ctx, f, nil); err != nil {
- logging.Errorf(ctx, "UpdateAssetMeta - %s", err.Error())
+ logging.Errorf(ctx, "UpdateAssetMeta (%s, %s) - %s", meta.GetChromeosDeviceId(), meta.GetHostname(), err.Error())
return err
}
return nil
diff --git a/go/src/infra/unifiedfleet/app/controller/dut_state.go b/go/src/infra/unifiedfleet/app/controller/dut_state.go
index 462fe5e..42f5146 100644
--- a/go/src/infra/unifiedfleet/app/controller/dut_state.go
+++ b/go/src/infra/unifiedfleet/app/controller/dut_state.go
@@ -22,7 +22,7 @@
// It's not ok that no such DUT (machine lse) exists in UFS.
_, err := inventory.GetMachineLSE(ctx, ds.GetHostname())
if err != nil {
- return errors.Annotate(err, "UpdateDutState").Err()
+ return err
}
hc := &HistoryClient{}
// It's ok that no old dut state for this DUT exists before.
@@ -36,7 +36,7 @@
}
if err := datastore.RunInTransaction(ctx, f, nil); err != nil {
- logging.Errorf(ctx, "UpdateDutState - %s", err)
+ logging.Errorf(ctx, "UpdateDutState (%s, %s) - %s", ds.GetId().GetValue(), ds.GetHostname(), err)
return nil, err
}
return ds, nil
diff --git a/go/src/infra/unifiedfleet/app/controller/machine.go b/go/src/infra/unifiedfleet/app/controller/machine.go
index 4e81c72..1534a8b 100644
--- a/go/src/infra/unifiedfleet/app/controller/machine.go
+++ b/go/src/infra/unifiedfleet/app/controller/machine.go
@@ -194,13 +194,13 @@
f := func(ctx context.Context) error {
machine, err := registration.GetMachine(ctx, meta.GetChromeosDeviceId())
if err != nil {
- return errors.Annotate(err, "UpdateDutMeta").Err()
+ return err
}
hc := getMachineHistoryClient(machine)
osMachine := machine.GetChromeosMachine()
if osMachine == nil {
- logging.Warningf(ctx, "UpdateDutMeta - %s is not a valid Chromeos machine", meta.GetChromeosDeviceId())
+ logging.Warningf(ctx, "%s is not a valid Chromeos machine", meta.GetChromeosDeviceId())
return nil
}
// Copy for logging
@@ -227,7 +227,7 @@
}
if err := datastore.RunInTransaction(ctx, f, nil); err != nil {
- logging.Errorf(ctx, "UpdateDutMeta - %s", err.Error())
+ logging.Errorf(ctx, "UpdateDutMeta (%s, %s) - %s", meta.GetChromeosDeviceId(), meta.GetHostname(), err.Error())
return err
}
return nil
diff --git a/go/src/infra/unifiedfleet/app/controller/machine_lse.go b/go/src/infra/unifiedfleet/app/controller/machine_lse.go
index 2c89c24..1ff5107 100644
--- a/go/src/infra/unifiedfleet/app/controller/machine_lse.go
+++ b/go/src/infra/unifiedfleet/app/controller/machine_lse.go
@@ -1409,13 +1409,13 @@
f := func(ctx context.Context) error {
lse, err := inventory.GetMachineLSE(ctx, meta.GetHostname())
if err != nil {
- return errors.Annotate(err, "UpdateLabMeta").Err()
+ return err
}
hc := getHostHistoryClient(lse)
dut := lse.GetChromeosMachineLse().GetDeviceLse().GetDut()
if dut == nil {
- logging.Warningf(ctx, "UpdateLabMeta - %s is not a valid Chromeos DUT", meta.GetHostname())
+ logging.Warningf(ctx, "%s is not a valid Chromeos DUT", meta.GetHostname())
return nil
}
@@ -1437,7 +1437,7 @@
return hc.SaveChangeEvents(ctx)
}
if err := datastore.RunInTransaction(ctx, f, nil); err != nil {
- logging.Errorf(ctx, "UpdateLabMeta - %s", err)
+ logging.Errorf(ctx, "UpdateLabMeta (%s, %s) - %s", meta.GetChromeosDeviceId(), meta.GetHostname(), err)
return err
}
return nil
