You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/08/21 15:44:09 UTC
[1/3] cassandra git commit: Lower logging to WARN in checkDataDirs
startup check
Repository: cassandra
Updated Branches:
refs/heads/trunk 1e951c983 -> e5b64f841
Lower logging to WARN in checkDataDirs startup check
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd46ca17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd46ca17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd46ca17
Branch: refs/heads/trunk
Commit: cd46ca17bc662d4add822a44334ec976376a7a45
Parents: a3fc425
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 21 16:43:15 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 21 16:43:15 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd46ca17/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 2d4686b..4934dea 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -195,7 +195,7 @@ public class StartupChecks
// check that directories exist.
if (!dir.exists())
{
- logger.error("Directory {} doesn't exist", dataDir);
+ logger.warn("Directory {} doesn't exist", dataDir);
// if they don't, failing their creation, stop cassandra.
if (!dir.mkdirs())
throw new StartupException(3, "Has no permission to create directory "+ dataDir);
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cf97f42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cf97f42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cf97f42
Branch: refs/heads/trunk
Commit: 4cf97f4241e134bd820b4add4132e2e7b6243941
Parents: 1c27abf cd46ca1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 21 16:44:10 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 21 16:44:10 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cf97f42/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StartupChecks.java
index 1c07b52,4934dea..eca0c7e
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@@ -179,30 -179,33 +179,30 @@@ public class StartupCheck
}
};
- public static final StartupCheck checkDataDirs = new StartupCheck()
+ public static final StartupCheck checkDataDirs = () ->
{
- public void execute() throws StartupException
+ // check all directories(data, commitlog, saved cache) for existence and permission
+ Iterable<String> dirs = Iterables.concat(Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()),
+ Arrays.asList(DatabaseDescriptor.getCommitLogLocation(),
+ DatabaseDescriptor.getSavedCachesLocation(),
+ DatabaseDescriptor.getHintsDirectory().getAbsolutePath()));
+ for (String dataDir : dirs)
{
- // check all directories(data, commitlog, saved cache) for existence and permission
- Iterable<String> dirs = Iterables.concat(Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()),
- Arrays.asList(DatabaseDescriptor.getCommitLogLocation(),
- DatabaseDescriptor.getSavedCachesLocation()));
- for (String dataDir : dirs)
- {
- logger.debug("Checking directory {}", dataDir);
- File dir = new File(dataDir);
-
- // check that directories exist.
- if (!dir.exists())
- {
- logger.warn("Directory {} doesn't exist", dataDir);
- // if they don't, failing their creation, stop cassandra.
- if (!dir.mkdirs())
- throw new StartupException(3, "Has no permission to create directory "+ dataDir);
- }
-
- // if directories exist verify their permissions
- if (!Directories.verifyFullPermissions(dir, dataDir))
- throw new StartupException(3, "Insufficient permissions on directory " + dataDir);
+ logger.debug("Checking directory {}", dataDir);
+ File dir = new File(dataDir);
+ // check that directories exist.
+ if (!dir.exists())
+ {
- logger.error("Directory {} doesn't exist", dataDir);
++ logger.warn("Directory {} doesn't exist", dataDir);
+ // if they don't, failing their creation, stop cassandra.
+ if (!dir.mkdirs())
+ throw new StartupException(3, "Has no permission to create directory "+ dataDir);
}
+
+ // if directories exist verify their permissions
+ if (!Directories.verifyFullPermissions(dir, dataDir))
+ throw new StartupException(3, "Insufficient permissions on directory " + dataDir);
}
};
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5b64f84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5b64f84
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5b64f84
Branch: refs/heads/trunk
Commit: e5b64f841b2b5c7a673f3735f68bc76cc76e6a97
Parents: 1e951c9 4cf97f4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 21 16:44:30 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 21 16:44:30 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------