HADOOP-16279 some changes to gabor's patch #0e6482dec21

* Tests for being in sync /not being in sync now compare etag and version IDs. Highlights we aren't always getting back version IDs.
* Parameterized OOB test now includes auth flag in mehod name, for ease of debugging
* minor: formatting

Change-Id: I7ea062d6996c9ca00d036347c310e5d2e0fa60fe

Author: steveloughran

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

@@ -389,7 +389,7 @@ public void initialize(URI name, Configuration originalConf)
             getMetadataStore(), allowAuthoritative);
       }
       initMultipartUploads(conf);
-      if(hasMetadataStore()) {
+      if (hasMetadataStore()) {
         long authDirTtl = conf.getTimeDuration(METADATASTORE_METADATA_TTL,
             DEFAULT_METADATASTORE_METADATA_TTL, TimeUnit.SECONDS);
         ttlTimeProvider = new S3Guard.TtlTimeProvider(authDirTtl);
@@ -2470,7 +2470,7 @@ S3AFileStatus innerGetFileStatus(final Path f,
 
     // Check MetadataStore, if any.
     PathMetadata pm = null;
-    if(hasMetadataStore()) {
+    if (hasMetadataStore()) {
       pm = S3Guard.getWithTtl(metadataStore, path, ttlTimeProvider);
     }
     Set<Path> tombstones = Collections.emptySet();

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3GuardOutOfBandOperations.java

@@ -126,7 +126,7 @@ public class ITestS3GuardOutOfBandOperations extends AbstractS3ATestBase {
    * Test array for parameterized test runs.
    * @return a list of parameter tuples.
    */
-  @Parameterized.Parameters
+  @Parameterized.Parameters(name="auth={0}")
   public static Collection<Object[]> params() {
     return Arrays.asList(new Object[][]{
         {true}, {false}
@@ -516,7 +516,7 @@ public void deleteAfterTombstoneExpiryOobCreate() throws Exception {
       awaitFileStatus(rawFS, filePath);
 
       // SET EXPIRY TIME, SO THE TOMBSTONE IS EXPIRED
-      when(mockTimeProvider.getNow()).thenReturn(100L + 2*ttl);
+      when(mockTimeProvider.getNow()).thenReturn(100L + 2 * ttl);
 
       // DELETE IN GUARDED FS
       guardedFs.delete(filePath, true);
@@ -777,6 +777,38 @@ private void verifyFileStatusAsExpected(final String firstText,
             expectedLength, guardedLength);
       }
     }
+    // check etag
+    final S3AFileStatus rawS3AFileStatus = (S3AFileStatus) rawFileStatus;
+    final S3AFileStatus guardedS3AFileStatus = (S3AFileStatus) guardedFileStatus;
+    final S3AFileStatus origS3AFileStatus = (S3AFileStatus) origStatus;
+    assertNotEquals(
+        "raw status still no to date with changes" + stats,
+        origS3AFileStatus.getETag(), rawS3AFileStatus.getETag());
+    if (allowAuthoritative) {
+      // expect the etag to be out of sync
+      assertNotEquals(
+          "etag in authoritative table with " + stats,
+          rawS3AFileStatus.getETag(), guardedS3AFileStatus.getETag());
+    } else {
+      assertEquals(
+          "etag in non-authoritative table with " + stats,
+          rawS3AFileStatus.getETag(), guardedS3AFileStatus.getETag());
+    }
+    // version ID if not null
+    final String rawVersionId = rawS3AFileStatus.getVersionId();
+    if (rawVersionId != null) {
+      final String guardedVersionId = guardedS3AFileStatus.getVersionId();
+      if (allowAuthoritative) {
+        // expect the versionID to be out of sync
+        assertNotEquals(
+            "version ID in authoritative table with " + stats,
+            rawVersionId, guardedVersionId);
+      } else {
+        assertEquals(
+            "version ID in non-=authoritative table with " + stats,
+            rawVersionId, guardedVersionId);
+      }
+    }
     // Next: modification time.
     long rawModTime = rawFileStatus.getModificationTime();
     long guardedModTime = guardedFileStatus.getModificationTime();