[jira] [Created] (HDDS-9152) Part of HDDS-7240 is missing due to incorrect conflict resolution

["Siyao Meng (Jira)" <ji...@apache.org>]

Siyao Meng created HDDS-9152:
--------------------------------

             Summary: Part of HDDS-7240 is missing due to incorrect conflict resolution
                 Key: HDDS-9152
                 URL: https://issues.apache.org/jira/browse/HDDS-9152
             Project: Apache Ozone
          Issue Type: Bug
            Reporter: Siyao Meng
            Assignee: Siyao Meng


As discovered by [~zitadombi], some of the changes that should have been merged as part of HDDS-7240 is missing.

The cause of it looks to be an incorrect conflict resolution in this commit:
https://github.com/apache/ozone/commit/4be3864675ad98801cda5caabde29734420bc662
, for which the relevant part is:
https://github.com/apache/ozone/blob/4be3864675ad98801cda5caabde29734420bc662/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java#L2636-L2643

This JIRA is a fix to re-apply the missing changes from HDDS-7240.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org