Author: reschke Date: Tue Oct 1 10:56:03 2019 New Revision: 1867837 URL: http://svn.apache.org/viewvc?rev=1867837&view=rev Log: OAK-8625: oak-upgrade leaks empty test folders (merged r1867005 into 1.10)
Modified: jackrabbit/oak/branches/1.10/ (props changed) jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java jackrabbit/oak/branches/1.10/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentAzureNodeStoreContainer.java Propchange: jackrabbit/oak/branches/1.10/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 1 10:56:03 2019 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854579-1854580,1854596,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859350-1859351,1859359,1859365,1859533,1859609 ,1859612,1859619,1859711,1859716,1859772,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1860931,1861114,1861270,1861626,1861743,1861757,1861763,1861770,1861776,1861780,1862044,1862093,1862266,1862370,1862422,1862447-1862448,1862465,1862499,1862531,1862536-1862537,1862728,1862746,1862806,1862817,1862881,1862926-1862927,1862976-1862977,1863076,1863081,1863086,1863369,1863405,1863540,1863633-1863634,1863642,1863645,1864349,1864353,1864667,1864674,1864681,1864683,1865286,1865630-1865631,1865654,1865752,1866039,1866041,1866382,1866453,1866457,1866697,1866730,1866734 +/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854579-1854580,1854596,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859350-1859351,1859359,1859365,1859533,1859609 ,1859612,1859619,1859711,1859716,1859772,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1860931,1861114,1861270,1861626,1861743,1861757,1861763,1861770,1861776,1861780,1862044,1862093,1862266,1862370,1862422,1862447-1862448,1862465,1862499,1862531,1862536-1862537,1862728,1862746,1862806,1862817,1862881,1862926-1862927,1862976-1862977,1863076,1863081,1863086,1863369,1863405,1863540,1863633-1863634,1863642,1863645,1864349,1864353,1864667,1864674,1864681,1864683,1865286,1865630-1865631,1865654,1865752,1866039,1866041,1866382,1866453,1866457,1866697,1866730,1866734,1867005 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java?rev=1867837&r1=1867836&r2=1867837&view=diff ============================================================================== --- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java (original) +++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java Tue Oct 1 10:56:03 2019 @@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.upgrad import static org.apache.jackrabbit.oak.segment.SegmentCache.DEFAULT_SEGMENT_CACHE_MB; import static org.apache.jackrabbit.oak.upgrade.cli.node.FileStoreUtils.asCloseable; +import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.security.InvalidKeyException; @@ -111,7 +112,9 @@ public class SegmentAzureFactory impleme throw new IllegalStateException(e); } - FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(Files.createTempDir()) + File tmpDir = Files.createTempDir(); + closer.register(() -> tmpDir.delete()); + FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(tmpDir) .withCustomPersistence(azPersistence).withMemoryMapping(false); if (blobStore != null) { @@ -163,17 +166,19 @@ public class SegmentAzureFactory impleme throw new IllegalStateException(e); } - FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(Files.createTempDir()) + File tmpDir = Files.createTempDir(); + FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(tmpDir) .withCustomPersistence(azPersistence).withMemoryMapping(false); ReadOnlyFileStore fs; try { fs = builder.buildReadOnly(); + return FileStoreUtils.hasExternalBlobReferences(fs); } catch (InvalidFileStoreVersionException e) { throw new IOException(e); + } finally { + tmpDir.delete(); } - - return FileStoreUtils.hasExternalBlobReferences(fs); } @Override Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentAzureNodeStoreContainer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentAzureNodeStoreContainer.java?rev=1867837&r1=1867836&r2=1867837&view=diff ============================================================================== --- jackrabbit/oak/branches/1.10/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentAzureNodeStoreContainer.java (original) +++ jackrabbit/oak/branches/1.10/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentAzureNodeStoreContainer.java Tue Oct 1 10:56:03 2019 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.oak.upgrade.cli.container; +import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.security.InvalidKeyException; @@ -45,6 +46,8 @@ public class SegmentAzureNodeStoreContai private final int mappedPort; + private File tmpDir; + private FileStore fs; public SegmentAzureNodeStoreContainer(AzuriteDockerRule azurite) throws IOException { @@ -80,7 +83,8 @@ public class SegmentAzureNodeStoreContai throw new IllegalStateException(e); } - FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(Files.createTempDir()) + tmpDir = Files.createTempDir(); + FileStoreBuilder builder = FileStoreBuilder.fileStoreBuilder(tmpDir) .withCustomPersistence(azPersistence).withMemoryMapping(false); if (blob != null) { @@ -97,6 +101,9 @@ public class SegmentAzureNodeStoreContai @Override public void close() { + if (tmpDir != null) { + tmpDir.delete(); + } if (fs != null) { fs.close(); fs = null;