Browse Source
* stable-4.4: Log if Repository.useCnt becomes negative Time based eviction strategy for repository cache Add method to read time unit from config Align include.path max depth with native git Config load should not fail on unsupported or nonexistent include path Allow using JDK 7 bootclasspath when compiling JGit using Java 8 Extract work queue to allow reusing it Change-Id: I6aeedb1cb8b0c3068af344a719c80a03ae68fc23 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-4.5
Matthias Sohn
8 years ago
12 changed files with 578 additions and 69 deletions
@ -0,0 +1,107 @@
|
||||
/* |
||||
* Copyright (C) 2016 Ericsson |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.lib; |
||||
|
||||
import static org.eclipse.jgit.lib.RepositoryCacheConfig.AUTO_CLEANUP_DELAY; |
||||
import static org.eclipse.jgit.lib.RepositoryCacheConfig.NO_CLEANUP; |
||||
import static org.junit.Assert.assertEquals; |
||||
|
||||
import java.util.concurrent.TimeUnit; |
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException; |
||||
import org.junit.Before; |
||||
import org.junit.Test; |
||||
|
||||
public class RepositoryCacheConfigTest { |
||||
|
||||
private RepositoryCacheConfig config; |
||||
|
||||
@Before |
||||
public void setUp() { |
||||
config = new RepositoryCacheConfig(); |
||||
} |
||||
|
||||
@Test |
||||
public void testDefaultValues() { |
||||
assertEquals(TimeUnit.HOURS.toMillis(1), config.getExpireAfter()); |
||||
assertEquals(config.getExpireAfter() / 10, config.getCleanupDelay()); |
||||
} |
||||
|
||||
@Test |
||||
public void testCleanupDelay() { |
||||
config.setCleanupDelay(TimeUnit.HOURS.toMillis(1)); |
||||
assertEquals(TimeUnit.HOURS.toMillis(1), config.getCleanupDelay()); |
||||
} |
||||
|
||||
@Test |
||||
public void testAutoCleanupDelay() { |
||||
config.setExpireAfter(TimeUnit.MINUTES.toMillis(20)); |
||||
config.setCleanupDelay(AUTO_CLEANUP_DELAY); |
||||
assertEquals(TimeUnit.MINUTES.toMillis(20), config.getExpireAfter()); |
||||
assertEquals(config.getExpireAfter() / 10, config.getCleanupDelay()); |
||||
} |
||||
|
||||
@Test |
||||
public void testAutoCleanupDelayShouldBeMax10minutes() { |
||||
config.setExpireAfter(TimeUnit.HOURS.toMillis(10)); |
||||
assertEquals(TimeUnit.HOURS.toMillis(10), config.getExpireAfter()); |
||||
assertEquals(TimeUnit.MINUTES.toMillis(10), config.getCleanupDelay()); |
||||
} |
||||
|
||||
@Test |
||||
public void testDisabledCleanupDelay() { |
||||
config.setCleanupDelay(NO_CLEANUP); |
||||
assertEquals(NO_CLEANUP, config.getCleanupDelay()); |
||||
} |
||||
|
||||
@Test |
||||
public void testFromConfig() throws ConfigInvalidException { |
||||
Config otherConfig = new Config(); |
||||
otherConfig.fromText("[core]\nrepositoryCacheExpireAfter=1000\n" |
||||
+ "repositoryCacheCleanupDelay=500"); |
||||
config.fromConfig(otherConfig); |
||||
assertEquals(1000, config.getExpireAfter()); |
||||
assertEquals(500, config.getCleanupDelay()); |
||||
} |
||||
} |
||||
@ -0,0 +1,152 @@
|
||||
/* |
||||
* Copyright (C) 2016 Ericsson |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
package org.eclipse.jgit.lib; |
||||
|
||||
import java.util.concurrent.TimeUnit; |
||||
|
||||
/** |
||||
* Configuration parameters for JVM-wide repository cache used by JGit. |
||||
* |
||||
* @since 4.4 |
||||
*/ |
||||
public class RepositoryCacheConfig { |
||||
|
||||
/** |
||||
* Set cleanupDelayMillis to this value in order to switch off time-based |
||||
* cache eviction. The JVM can still expire cache entries when heap memory |
||||
* runs low. |
||||
*/ |
||||
public static final long NO_CLEANUP = 0; |
||||
|
||||
/** |
||||
* Set cleanupDelayMillis to this value in order to auto-set it to minimum |
||||
* of 1/10 of expireAfterMillis and 10 minutes |
||||
*/ |
||||
public static final long AUTO_CLEANUP_DELAY = -1; |
||||
|
||||
private long expireAfterMillis; |
||||
|
||||
private long cleanupDelayMillis; |
||||
|
||||
/** Create a default configuration. */ |
||||
public RepositoryCacheConfig() { |
||||
expireAfterMillis = TimeUnit.HOURS.toMillis(1); |
||||
cleanupDelayMillis = AUTO_CLEANUP_DELAY; |
||||
} |
||||
|
||||
/** |
||||
* @return the time an unused repository should expired and be evicted from |
||||
* the RepositoryCache in milliseconds. <b>Default is 1 hour.</b> |
||||
*/ |
||||
public long getExpireAfter() { |
||||
return expireAfterMillis; |
||||
} |
||||
|
||||
/** |
||||
* @param expireAfterMillis |
||||
* the time an unused repository should expired and be evicted |
||||
* from the RepositoryCache in milliseconds. |
||||
*/ |
||||
public void setExpireAfter(long expireAfterMillis) { |
||||
this.expireAfterMillis = expireAfterMillis; |
||||
} |
||||
|
||||
/** |
||||
* @return the delay between the periodic cleanup of expired repository in |
||||
* milliseconds. <b>Default is minimum of 1/10 of expireAfterMillis |
||||
* and 10 minutes</b> |
||||
*/ |
||||
public long getCleanupDelay() { |
||||
if (cleanupDelayMillis < 0) { |
||||
return Math.min(expireAfterMillis / 10, |
||||
TimeUnit.MINUTES.toMillis(10)); |
||||
} |
||||
return cleanupDelayMillis; |
||||
} |
||||
|
||||
/** |
||||
* @param cleanupDelayMillis |
||||
* the delay between the periodic cleanup of expired repository |
||||
* in milliseconds. Set it to {@link #AUTO_CLEANUP_DELAY} to |
||||
* automatically derive cleanup delay from expireAfterMillis. |
||||
* <p> |
||||
* Set it to {@link #NO_CLEANUP} in order to switch off cache |
||||
* expiration. |
||||
* <p> |
||||
* If cache expiration is switched off the JVM still can evict |
||||
* cache entries when the JVM is running low on available heap |
||||
* memory. |
||||
*/ |
||||
public void setCleanupDelay(long cleanupDelayMillis) { |
||||
this.cleanupDelayMillis = cleanupDelayMillis; |
||||
} |
||||
|
||||
/** |
||||
* Update properties by setting fields from the configuration. |
||||
* <p> |
||||
* If a property is not defined in the configuration, then it is left |
||||
* unmodified. |
||||
* |
||||
* @param config |
||||
* configuration to read properties from. |
||||
* @return {@code this}. |
||||
*/ |
||||
public RepositoryCacheConfig fromConfig(Config config) { |
||||
setExpireAfter( |
||||
config.getTimeUnit("core", null, "repositoryCacheExpireAfter", //$NON-NLS-1$//$NON-NLS-2$
|
||||
getExpireAfter(), TimeUnit.MILLISECONDS)); |
||||
setCleanupDelay( |
||||
config.getTimeUnit("core", null, "repositoryCacheCleanupDelay", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
AUTO_CLEANUP_DELAY, TimeUnit.MILLISECONDS)); |
||||
return this; |
||||
} |
||||
|
||||
/** |
||||
* Install this configuration as the live settings. |
||||
* <p> |
||||
* The new configuration is applied immediately. |
||||
*/ |
||||
public void install() { |
||||
RepositoryCache.reconfigure(this); |
||||
} |
||||
} |
||||
@ -0,0 +1,99 @@
|
||||
/* |
||||
* Copyright (C) 2008-2016, Google Inc. |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.lib; |
||||
|
||||
import java.util.concurrent.Executors; |
||||
import java.util.concurrent.ScheduledThreadPoolExecutor; |
||||
import java.util.concurrent.ThreadFactory; |
||||
|
||||
/** |
||||
* Simple work queue to run tasks in the background |
||||
*/ |
||||
class WorkQueue { |
||||
private static final ScheduledThreadPoolExecutor executor; |
||||
|
||||
static final Object executorKiller; |
||||
|
||||
static { |
||||
// To support garbage collection, start our thread but
|
||||
// swap out the thread factory. When our class is GC'd
|
||||
// the executorKiller will finalize and ask the executor
|
||||
// to shutdown, ending the worker.
|
||||
//
|
||||
int threads = 1; |
||||
executor = new ScheduledThreadPoolExecutor(threads, |
||||
new ThreadFactory() { |
||||
private final ThreadFactory baseFactory = Executors |
||||
.defaultThreadFactory(); |
||||
|
||||
public Thread newThread(Runnable taskBody) { |
||||
Thread thr = baseFactory.newThread(taskBody); |
||||
thr.setName("JGit-WorkQueue"); //$NON-NLS-1$
|
||||
thr.setDaemon(true); |
||||
return thr; |
||||
} |
||||
}); |
||||
executor.setRemoveOnCancelPolicy(true); |
||||
executor.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); |
||||
executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); |
||||
executor.prestartAllCoreThreads(); |
||||
|
||||
// Now that the threads are running, its critical to swap out
|
||||
// our own thread factory for one that isn't in the ClassLoader.
|
||||
// This allows the class to GC.
|
||||
//
|
||||
executor.setThreadFactory(Executors.defaultThreadFactory()); |
||||
|
||||
executorKiller = new Object() { |
||||
@Override |
||||
protected void finalize() { |
||||
executor.shutdownNow(); |
||||
} |
||||
}; |
||||
} |
||||
|
||||
static ScheduledThreadPoolExecutor getExecutor() { |
||||
return executor; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue