Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make SlaveLockClient cope better with ComExceptions #6102

Merged
merged 7 commits into from Dec 18, 2015
Merged

Make SlaveLockClient cope better with ComExceptions #6102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2249c27
Remove unused LockManager interface and related code
chrisvest Dec 14, 2015
2449632
Prepare SlaveLockManagerTest for more complicated setups
chrisvest Dec 14, 2015
03da069
Remove the SlaveLockManager.Configuration interface
chrisvest Dec 14, 2015
ee18cdc
Remove the Locks.Client.releaseAllShared and releaseAllExclusive
chrisvest Dec 14, 2015
8ab3bc8
Don't use lower-case L for long literals
chrisvest Dec 14, 2015
66178b9
Make SlaveLocksClientTest use fewer mocks
chrisvest Dec 14, 2015
db7229f
Make SlaveLockClient throw DistributedLockFailureException on master …
chrisvest Dec 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 0 additions & 126 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/locking/LockManager.java
View file
Open in desktop

This file was deleted.

21 changes: 1 addition & 20 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/locking/LockType.java
View file
Open in desktop
Expand Up @@ -19,29 +19,10 @@
*/
package org.neo4j.kernel.impl.locking;

import org.neo4j.kernel.api.KernelTransaction;

/**
* Enum defining the <CODE>READ</CODE> lock and the <CODE>WRITE</CODE> lock.
*/
public enum LockType
{
READ
{
@Override
public void release( LockManager lockManager, Object resource, KernelTransaction tx )
{
lockManager.releaseReadLock( resource, tx );
}
},
WRITE
{
@Override
public void release( LockManager lockManager, Object resource, KernelTransaction tx )
{
lockManager.releaseWriteLock( resource, tx );
}
};

public abstract void release( LockManager lockManager, Object resource, KernelTransaction tx );
READ, WRITE
}
6 changes: 0 additions & 6 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java
View file
Open in desktop
Expand Up @@ -98,12 +98,6 @@ interface Client extends AutoCloseable
/** Release a set of exclusive locks */
void releaseExclusive( ResourceType resourceType, long... resourceIds );

/** Release all shared locks. */
void releaseAllShared();

/** Release all exclusive locks. */
void releaseAllExclusive();

/** Release all locks. */
void releaseAll();

Expand Down
10 changes: 0 additions & 10 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/locking/NoOpClient.java
View file
Open in desktop
Expand Up @@ -53,16 +53,6 @@ public void releaseExclusive( Locks.ResourceType resourceType, long... resourceI
{
}

@Override
public void releaseAllShared()
{
}

@Override
public void releaseAllExclusive()
{
}

@Override
public void releaseAll()
{
Expand Down
6 changes: 2 additions & 4 deletions ...ity/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/CommunityLockClient.java
View file
Open in desktop
Expand Up @@ -165,15 +165,13 @@ public void releaseExclusive( Locks.ResourceType resourceType, long... resourceI
}
}

@Override
public void releaseAllShared()
private void releaseAllShared()
{
sharedLocks.visitEntries( typeReadReleaser );
sharedLocks.clear();
}

@Override
public void releaseAllExclusive()
private void releaseAllExclusive()
{
exclusiveLocks.visitEntries( typeWriteReleaser );
exclusiveLocks.clear();
Expand Down
13 changes: 2 additions & 11 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/LockManagerImpl.java
View file
Open in desktop
Expand Up @@ -24,12 +24,11 @@

import org.neo4j.helpers.collection.Visitor;
import org.neo4j.kernel.DeadlockDetectedException;
import org.neo4j.kernel.impl.locking.LockManager;
import org.neo4j.kernel.impl.transaction.IllegalResourceException;
import org.neo4j.kernel.impl.util.StringLogger;
import org.neo4j.kernel.logging.Logging;

public class LockManagerImpl implements LockManager
public class LockManagerImpl
{
private final Map<Object,RWLock> resourceLockMap = new HashMap<>();
private final RagManager ragManager;
Expand All @@ -39,58 +38,50 @@ public LockManagerImpl( RagManager ragManager )
this.ragManager = ragManager;
}

@Override
public long getDetectedDeadlockCount()
{
return ragManager.getDeadlockCount();
}

@Override
public void getReadLock( Object resource, Object tx )
throws DeadlockDetectedException, IllegalResourceException
{
getRWLockForAcquiring( resource, tx ).acquireReadLock( tx );
}

@Override
public boolean tryReadLock( Object resource, Object tx )
throws IllegalResourceException
{
return getRWLockForAcquiring( resource, tx ).tryAcquireReadLock( tx );
}

@Override
public void getWriteLock( Object resource, Object tx )
throws DeadlockDetectedException, IllegalResourceException
{
getRWLockForAcquiring( resource, tx ).acquireWriteLock( tx );
}

@Override
public boolean tryWriteLock( Object resource, Object tx )
throws IllegalResourceException
{
return getRWLockForAcquiring( resource, tx ).tryAcquireWriteLock( tx );
}

@Override
public void releaseReadLock( Object resource, Object tx )
throws LockNotFoundException, IllegalResourceException
{
getRWLockForReleasing( resource, tx, 1, 0 ).releaseReadLock( tx );
}

@Override
public void releaseWriteLock( Object resource, Object tx )
throws LockNotFoundException, IllegalResourceException
{
getRWLockForReleasing( resource, tx, 0, 1 ).releaseWriteLock( tx );
}

@Override
public void dumpLocksOnResource( Object resource, Logging logging )
{
StringLogger logger = logging.getMessagesLog( LockManager.class );
StringLogger logger = logging.getMessagesLog( LockManagerImpl.class );
RWLock lock;
synchronized ( resourceLockMap )
{
Expand Down