Merge pull request #1317 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-metadata-log-duplicate to release/2.8.0

* commit '05196aacaa3d9a57d27dae994a57b145a2bcbbc2':
  metadata日志:避免对比更新后的value
This commit is contained in:
李泽玺
2019-03-23 15:52:17 +08:00
+3 -2
View File
@@ -251,6 +251,7 @@ func (manager *SMetadataManager) SetValues(ctx context.Context, obj IModel, stor
}
} else {
deleted := record.Deleted
oValue := record.Value
_, err := Update(&record, func() error {
record.Deleted = false
record.Value = valStr
@@ -262,8 +263,8 @@ func (manager *SMetadataManager) SetValues(ctx context.Context, obj IModel, stor
if deleted {
changes = append(changes, sMetadataChange{Key: key, NValue: valStr})
} else {
if record.Value != valStr {
changes = append(changes, sMetadataChange{Key: key, OValue: record.Value, NValue: valStr})
if oValue != valStr {
changes = append(changes, sMetadataChange{Key: key, OValue: oValue, NValue: valStr})
}
}
}