Skip to content

Commit 8526d78

Browse files
jdcaseyjdcasey
committed
removed fast-local / routed tests, and add impliedRepo validation to tests
Add some wait times to a couple of tests to deal with different way of populating disabled threadpools that are also scheduled.
1 parent 366a8d8 commit 8526d78

15 files changed

Lines changed: 24 additions & 431 deletions

‎addons/implied-repos/ftests/src/main/java/org/commonjava/indy/implrepo/skim/DisabledGroupNotAddingImpliedTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public void skimPomForRepoAndAddItInGroup()
6464
logger.debug( "Start testing!" );
6565
final PomRef ref = loadPom( "one-repo", Collections.singletonMap( "one-repo.url", server.formatUrl( REPO ) ) );
6666

67+
server.expect( "HEAD", server.formatUrl( REPO, "/" ), 200, (String) null );
6768
server.expect( server.formatUrl( TEST_REPO, ref.path ), 200, ref.pom );
6869

6970
final StoreKey testRepoKey =

‎addons/implied-repos/ftests/src/main/java/org/commonjava/indy/implrepo/skim/EnabledGroupAddingImpliedTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void skimPomForRepoAndAddItInGroup()
6363
logger.debug( "Start testing!" );
6464
final PomRef ref = loadPom( "one-repo", Collections.singletonMap( "one-repo.url", server.formatUrl( REPO ) ) );
6565

66+
server.expect( "HEAD", server.formatUrl( REPO, "/" ), 200, (String) null );
6667
server.expect( server.formatUrl( TEST_REPO, ref.path ), 200, ref.pom );
6768

6869
final StoreKey testRepoKey =

‎addons/implied-repos/ftests/src/main/java/org/commonjava/indy/implrepo/skim/PomWithPluginRepoAddsRepoToGroupTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void skimPomForRepoAndAddIt() throws Exception
6464
{
6565
final PomRef ref =
6666
loadPom( "one-plugin-repo", Collections.singletonMap( "one-repo.url", server.formatUrl( REPO ) ) );
67-
67+
68+
server.expect( "HEAD", server.formatUrl( REPO, "/" ), 200, (String) null );
6869
server.expect( server.formatUrl( TEST_REPO, ref.path ), 200, ref.pom );
6970

7071
final StoreKey pubGroupKey = new StoreKey( MavenPackageTypeDescriptor.MAVEN_PKG_KEY, StoreType.group,

‎addons/implied-repos/ftests/src/main/java/org/commonjava/indy/implrepo/skim/PomWithRepoAddsRepoToGroupTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public class PomWithRepoAddsRepoToGroupTest
6363
public void skimPomForRepoAndAddIt() throws Exception
6464
{
6565
final PomRef ref = loadPom( "one-repo", Collections.singletonMap( "one-repo.url", server.formatUrl( REPO ) ) );
66-
66+
67+
server.expect( "HEAD", server.formatUrl( REPO, "/" ), 200, (String) null );
6768
server.expect( server.formatUrl( TEST_REPO, ref.path ), 200, ref.pom );
6869

6970
final StoreKey pubGroupKey = new StoreKey( MavenPackageTypeDescriptor.MAVEN_PKG_KEY, StoreType.group,
@@ -78,6 +79,7 @@ public void skimPomForRepoAndAddIt() throws Exception
7879
// sleep while event observer runs...
7980
System.out.println( "Waiting 5s for events to run." );
8081
Thread.sleep( 5000 );
82+
System.out.println("Resuming test.");
8183

8284
final Group g = client.stores().load( pubGroupKey, Group.class );
8385
final StoreKey remoteRepoKey = new StoreKey( MavenPackageTypeDescriptor.MAVEN_PKG_KEY, StoreType.remote, REPO );

‎addons/implied-repos/ftests/src/main/java/org/commonjava/indy/implrepo/skim/ResolveDepViaSkimmedRepoInGroupTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public void downloadPomInImpliedRepoViaGroup()
6666
final PomRef pomRef = loadPom( "one-repo", Collections.singletonMap( "one-repo.url", repoUrl ) );
6767
final PomRef simplePomRef = loadPom( "simple", Collections.emptyMap() );
6868

69+
server.expect( "HEAD", server.formatUrl( REPO, "/" ), 200, (String) null );
6970
server.expect( server.formatUrl( TEST_REPO, pomRef.path ), 200, pomRef.pom );
7071
server.expect( server.formatUrl( REPO, simplePomRef.path ), 200, simplePomRef.pom );
7172

‎filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java‎

Lines changed: 8 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
package org.commonjava.indy.filer.def;
1717

1818
import org.commonjava.cdi.util.weft.ExecutorConfig;
19+
import org.commonjava.cdi.util.weft.PoolWeftExecutorService;
1920
import org.commonjava.cdi.util.weft.WeftManaged;
21+
import org.commonjava.cdi.util.weft.WeftScheduledExecutor;
2022
import org.commonjava.indy.content.IndyChecksumAdvisor;
2123
import org.commonjava.indy.content.SpecialPathSetProducer;
2224
import org.commonjava.indy.filer.def.conf.DefaultStorageProviderConfiguration;
@@ -60,6 +62,7 @@
6062
import java.io.File;
6163
import java.util.Optional;
6264
import java.util.concurrent.ExecutorService;
65+
import java.util.concurrent.ScheduledExecutorService;
6366

6467
import static org.commonjava.indy.model.core.StoreType.hosted;
6568
import static org.commonjava.maven.galley.io.checksum.ChecksummingDecoratorAdvisor.ChecksumAdvice.CALCULATE_AND_WRITE;
@@ -93,10 +96,11 @@ public class DefaultGalleyStorageProvider
9396
@Inject
9497
private SpecialPathManager specialPathManager;
9598

96-
@ExecutorConfig( named = "indy-fast-local-executor", threads = 5, priority = 2 )
97-
@WeftManaged
99+
@ExecutorConfig( named = "galley-delete-executor", threads = 5, priority = 2 )
100+
// @WeftManaged
101+
@WeftScheduledExecutor
98102
@Inject
99-
private ExecutorService fastLocalExecutors;
103+
private ScheduledExecutorService deleteExecutor;
100104

101105
@Inject
102106
private TransferMetadataConsumer contentMetadataConsumer;
@@ -217,62 +221,7 @@ else if ( checksumAdvisors != null )
217221

218222
final File storeRoot = config.getStorageRootDirectory();
219223

220-
cacheProviderFactory = new PartyLineCacheProviderFactory( storeRoot );
221-
222-
final File nfsBasedir = config.getNFSStorageRootDirectory();
223-
if ( nfsBasedir != null )
224-
{
225-
if ( !nfsBasedir.exists() )
226-
{
227-
nfsBasedir.mkdirs();
228-
}
229-
230-
// nfs root can not be created due to some security reason(like permission), will bypass FastLocal provider and use PartyLine
231-
if ( nfsBasedir.exists() )
232-
{
233-
234-
final FastLocalCacheProviderFactory fastLocalFac;
235-
final CacheInstanceAdapter<String, String> nfsOwnerCacheAdapter =
236-
new CacheInstanceAdapter<>( nfsOwnerCache );
237-
if ( fastLocalFileRemoveCache == null )
238-
{
239-
fastLocalFac = new FastLocalCacheProviderFactory( storeRoot, nfsBasedir, nfsOwnerCacheAdapter,
240-
fastLocalExecutors );
241-
}
242-
else
243-
{
244-
final CacheInstanceAdapter<String, ConcreteResource> fastLocalFileRemoveCacheAdapter =
245-
new CacheInstanceAdapter<>( fastLocalFileRemoveCache );
246-
fastLocalFac = new FastLocalCacheProviderFactory( storeRoot, nfsBasedir, nfsOwnerCacheAdapter,
247-
fastLocalFileRemoveCacheAdapter,
248-
fastLocalExecutors );
249-
}
250-
251-
cacheProviderFactory = new RoutingCacheProviderFactory( ( resource ) ->
252-
{
253-
if ( resource != null )
254-
{
255-
final Location loc =
256-
resource.getLocation();
257-
258-
// looking for KeyedLocation and StoreType.hosted should be faster than regex on the URI.
259-
return (
260-
( loc instanceof KeyedLocation )
261-
&& hosted
262-
== ( (KeyedLocation) loc )
263-
.getKey()
264-
.getType() );
265-
}
266-
return false;
267-
}, fastLocalFac, cacheProviderFactory );
268-
}
269-
else
270-
{
271-
logger.warn(
272-
"[Indy] nfs base dir {} can not be created correctly due to some unknown reasons, will use partyline cache provider as default",
273-
nfsBasedir );
274-
}
275-
}
224+
cacheProviderFactory = new PartyLineCacheProviderFactory( storeRoot, deleteExecutor );
276225

277226
// TODO: Tie this into a config file!
278227
transportManagerConfig = new TransportManagerConfig();

‎filers/default/src/main/java/org/commonjava/indy/filer/def/conf/DefaultStorageProviderConfiguration.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ public File getStorageRootDirectory()
6464
return storageBasedir == null ? DEFAULT_BASEDIR : storageBasedir;
6565
}
6666

67+
@Deprecated
6768
public File getNFSStorageRootDirectory()
6869
{
6970
// return nfsStoreBasedir == null ? DEFAULT_NFS_BASEDIR : nfsStoreBasedir;
7071
return nfsStoreBasedir;
7172
}
7273

7374
@ConfigName( "storage.dir" )
75+
@Deprecated
7476
public void setStorageRootDirectory( final File storageBasedir )
7577
{
7678
this.storageBasedir = storageBasedir;

‎ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipAddMayDisruptMetadataTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public void run()
100100
Callable<String> groupAddTask = new GroupAddCallable( remoteRepositoryC.getKey() );
101101
Future<String> user2 = fixedPool.submit( groupAddTask );
102102

103+
Thread.sleep( 2000 );
104+
103105
String metadata = user1.get();
104106
String retCode = user2.get();
105107

‎ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipChangeUpdateMetadataTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,8 @@ public void run()
284284

285285
checkGroupMembership( remoteRepositoryA.getKey(), remoteRepositoryB.getKey(), remoteRepositoryC.getKey() );
286286

287+
Thread.sleep( 2000 );
288+
287289
// Get merged from A, B, C
288290
user1 = fixedPool.submit( groupMetaTask );
289291
metadata = user1.get();

‎ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RoutedCacheProviderForGroupTest.java‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)