Merge pull request #6435 from jfdenise/WFCORE-7269

Fix for WFCORE-7269, ProvisioningConsistencyTestCase failures with s390 Semeru

Author: yersan

testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/provisioning/ProvisioningConsistencyTestCase.java

@@ -24,9 +24,11 @@
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.commons.io.FileUtils;
+import static org.jboss.as.test.shared.FileUtils.computeHash;
+import static org.jboss.as.test.shared.FileUtils.unzipFile;
+
 import org.jboss.logging.Logger;
-import org.junit.AssumptionViolatedException;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -59,17 +61,13 @@ private static Path resolveJBossHome() {
         }
     }
 
-    @BeforeClass
-    public static void assumeNotS390() {
-        if ("s390x".equalsIgnoreCase(System.getProperty("os.arch"))) {
-            throw new AssumptionViolatedException("WFCORE-7269");
-        }
+    private static File getDistFile(Path channelPath, boolean exists, boolean directory, List<String> errors) {
+        return getDistFile(CHANNEL_INSTALLATION, channelPath, DIST_INSTALLATION, exists, directory, errors);
     }
 
-    private static File getDistFile(Path channelPath, boolean exists, boolean directory, List<String> errors) {
-        Path relative = CHANNEL_INSTALLATION.relativize(channelPath);
-        System.out.println("Getting dist file for relative path " + relative);
-        Path path = DIST_INSTALLATION.resolve(relative);
+    private static File getDistFile(Path currentRoot, Path currentPath, Path distRoot, boolean exists, boolean directory, List<String> errors) {
+        Path relative = currentRoot.relativize(currentPath);
+        Path path = distRoot.resolve(relative);
         File test = path.toFile();
         File result = null;
         if (exists) {
@@ -142,9 +140,14 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
                 } else {
                     File distFile = getDistFile(path, true, false, errors);
                     if (distFile != null) {
-                        if (path.toFile().length() != distFile.length()) {
-                            errors.add(String.format("dist file for %s has an unexpected length: %d not %d",
+                       if (path.toFile().length() != distFile.length()) {
+                           log.trace("File size is different");
+                           // This can happen on some platforms for fat jar generated at provisioning time.
+                           // Check that the actual jar content is identical.
+                            if (!sameJarContent(path, distFile.toPath(), errors)) {
+                                errors.add(String.format("dist file for %s has an unexpected length: %d not %d",
                                     path, distFile.length(), path.toFile().length()));
+                            }
                         }
                     }
                 }
@@ -169,4 +172,89 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
             fail(errors.toString());
         }
     }
+
+    private static boolean sameJarContent(Path current, Path dist, List<String> errors) {
+        if (!dist.getFileName().toString().endsWith(".jar")) {
+            return false;
+        }
+        log.trace("Checking jar " + current);
+        Path tempFolder = null;
+        try {
+            tempFolder = Files.createTempDirectory("checkconsistency");
+            Path distUnzipped = tempFolder.resolve("dist");
+            Path currentUnzipped = tempFolder.resolve("current");
+            unzipFile(dist, distUnzipped);
+            unzipFile(current, currentUnzipped);
+            checkContent(currentUnzipped, distUnzipped, errors);
+            if(errors.isEmpty()) return true;
+        } catch (IOException ex) {
+            errors.add("Exception occurred when checking " + dist + " file content. " + ex);
+        } finally {
+            try {
+                if (tempFolder != null) {
+                    FileUtils.deleteDirectory(tempFolder.toFile());
+                }
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+        return false;
+    }
+
+    private static void checkContent(Path currentRoot, Path dist, List<String> errors) throws IOException {
+        Files.walkFileTree(currentRoot, new FileVisitor<>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                log.trace("Testing " + dir);
+                if (dir.equals(currentRoot)) {
+                    File distRoot = getDistFile(currentRoot, dir, dist, true, true, errors);
+                    Set<String> channelChildren = new TreeSet<>(Arrays.asList(Objects.requireNonNull(dir.toFile().list())));
+                    Set<String> distChildren = new TreeSet<>(Arrays.asList(Objects.requireNonNull(distRoot.list())));
+                    assertEquals(dir.toString(), channelChildren, distChildren);
+                    return FileVisitResult.CONTINUE;
+                } else {
+                    File distDir = getDistFile(currentRoot, dir, dist, true, true, errors);
+                    if (distDir != null) {
+                        assertTrue(dir.toString(), Objects.deepEquals(dir.toFile().list(), distDir.list()));
+                        return FileVisitResult.CONTINUE;
+                    } else {
+                        return FileVisitResult.SKIP_SUBTREE;
+                    }
+                }
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
+                System.out.println("Checking " + path);
+                File distFile = getDistFile(currentRoot, path, dist, true, false, errors);
+                if (distFile == null) {
+                    errors.add(String.format("current file %s has not been found in %s",
+                            path, dist));
+                } else {
+                    try {
+                        String hash1 = computeHash(path);
+                        String hash2 = computeHash(distFile.toPath());
+                        if (!hash1.equals(hash2)) {
+                            errors.add(String.format("dist file for %s has an unexpected content",
+                                    path));
+                        }
+                    } catch (Exception ex) {
+                        errors.add(String.format("dist file for %s has an unexpected length: %d not %d",
+                                    path, distFile.length(), path.toFile().length()));
+                    }
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+                throw exc;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
 }

testsuite/shared/src/main/java/org/jboss/as/test/shared/FileUtils.java

@@ -11,10 +11,21 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigInteger;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitOption;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.security.MessageDigest;
+import java.util.EnumSet;
 
 /**
  * Shared fs utils for the test suite.
@@ -130,5 +141,50 @@ public static void close(Closeable closeable) {
         }
     }
 
+    public static String computeHash(Path p) throws Exception {
+        byte[] data = Files.readAllBytes(p);
+        byte[] hash = MessageDigest.getInstance("MD5").digest(data);
+        return new BigInteger(1, hash).toString(16);
+    }
+
+    public static void unzipFile(Path zipFile, Path targetDir) throws IOException {
+        if (!Files.exists(targetDir)) {
+            Files.createDirectories(targetDir);
+        }
+        try (FileSystem zipfs = newFileSystem(zipFile)) {
+            for (Path zipRoot : zipfs.getRootDirectories()) {
+                unzip(zipRoot, targetDir);
+            }
+        }
+    }
+
+    private static FileSystem newFileSystem(Path path) throws IOException {
+        return FileSystems.newFileSystem(path, (ClassLoader) null);
+    }
 
+    private static void unzip(Path source, Path target) throws IOException {
+        Files.walkFileTree(source, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,
+                new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+                    throws IOException {
+                final Path targetDir = target.resolve(source.relativize(dir).toString());
+                try {
+                    Files.copy(dir, targetDir);
+                } catch (FileAlreadyExistsException e) {
+                    if (!Files.isDirectory(targetDir)) {
+                        throw e;
+                    }
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                    throws IOException {
+                Files.copy(file, target.resolve(source.relativize(file).toString()), StandardCopyOption.REPLACE_EXISTING);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
 }// class