honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not swallow node lock failed exception 

When attempting to obtain the node lock, if an exception is thrown it is
not logged. This makes debugging difficult. This commit causes such an
exception to be logged.

Relates #25176
This commit is contained in:
Jason Tedor 2017-06-12 11:42:45 -04:00 committed by GitHub
parent 2e29b69f6a
commit 982900eabf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/env/NodeEnvironment.java vendored
View File

@ -199,7 +199,6 @@ public final class NodeEnvironment implements Closeable {
int maxLocalStorageNodes = MAX_LOCAL_STORAGE_NODES_SETTING.get(settings); int maxLocalStorageNodes = MAX_LOCAL_STORAGE_NODES_SETTING.get(settings);
for (int possibleLockId = 0; possibleLockId < maxLocalStorageNodes; possibleLockId++) { for (int possibleLockId = 0; possibleLockId < maxLocalStorageNodes; possibleLockId++) {
for (int dirIndex = 0; dirIndex < environment.dataFiles().length; dirIndex++) { for (int dirIndex = 0; dirIndex < environment.dataFiles().length; dirIndex++) {
Path dataDirWithClusterName = environment.dataWithClusterFiles()[dirIndex];
Path dataDir = environment.dataFiles()[dirIndex]; Path dataDir = environment.dataFiles()[dirIndex];
Path dir = resolveNodePath(dataDir, possibleLockId); Path dir = resolveNodePath(dataDir, possibleLockId);
Files.createDirectories(dir); Files.createDirectories(dir);
@ -211,7 +210,8 @@ public final class NodeEnvironment implements Closeable {
nodePaths[dirIndex] = new NodePath(dir); nodePaths[dirIndex] = new NodePath(dir);
nodeLockId = possibleLockId; nodeLockId = possibleLockId;
} catch (LockObtainFailedException ex) { } catch (LockObtainFailedException ex) {
startupTraceLogger.trace("failed to obtain node lock on {}", dir.toAbsolutePath()); startupTraceLogger.trace(
new ParameterizedMessage("failed to obtain node lock on {}", dir.toAbsolutePath()), ex);
// release all the ones that were obtained up until now // release all the ones that were obtained up until now
releaseAndNullLocks(locks); releaseAndNullLocks(locks);
break; break;