[HADOOP-14096] s3guard: regression in dirListingUnion

• Type: Sub-task
• Status: Resolved
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: HADOOP-13345
• Fix Version/s: HADOOP-13345
• Component/s: fs/s3
• Target Version/s: HADOOP-13345
• Assignee: Aaron Fabbri
• Reporter: Aaron Fabbri
• Created: 20/Feb/17 05:15
• Updated: 21/Feb/17 00:03
• Resolved: 21/Feb/17 00:03

Description

Just noticed HADOOP-14020 introduced a bug in S3Guard#dirListingUnion.

The offending change is here:

-      if (dirMeta.get(s.getPath()) == null) {
-        dirMeta.put(s);
-      }
+      changed = changed || dirMeta.put(s);
+    }
+

hint: Logical OR is a short-circuit operator.
Easy fix, but should probably come with a unit test for dirListingUnion().