natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[17986] Replace hardcoded numbers with StartupException enum for exitOrFail calls.

This commit is contained in:
Kanthi Subramanian 2023-02-07 16:22:35 -05:00
parent a68c0983b4
commit c799873471
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/org/apache/cassandra/exceptions/StartupException.java
View File

@ -26,7 +26,6 @@ public class StartupException extends Exception
public final static int ERR_WRONG_MACHINE_STATE = 1;
public final static int ERR_WRONG_DISK_STATE = 3;
public final static int ERR_WRONG_CONFIG = 100;
public final static int ERR_OUTDATED_SCHEMA = 101;
public final int returnCode;

8
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -182,7 +182,7 @@ public class CassandraDaemon
}
catch (IOException e)
{
exitOrFail(1, e.getMessage(), e.getCause());
exitOrFail(StartupException.ERR_WRONG_MACHINE_STATE, e.getMessage(), e.getCause());
}
}
@ -418,7 +418,7 @@ public class CassandraDaemon
catch (ConfigurationException e)
{
System.err.println(e.getMessage() + "\nFatal configuration error; unable to start server. See log for stacktrace.");
exitOrFail(1, "Fatal configuration error", e);
exitOrFail(StartupException.ERR_WRONG_MACHINE_STATE, "Fatal configuration error", e);
}
// Because we are writing to the system_distributed keyspace, this should happen after that is created, which
@ -794,7 +794,7 @@ public class CassandraDaemon
logger.error("Exception encountered during startup", e);
// try to warn user on stdout too, if we haven't already detached
e.printStackTrace();
exitOrFail(3, "Exception encountered during startup", e);
exitOrFail(StartupException.ERR_WRONG_DISK_STATE, "Exception encountered during startup", e);
}
else
{
@ -802,7 +802,7 @@ public class CassandraDaemon
logger.error("Exception encountered during startup: {}", e.getMessage());
// try to warn user on stdout too, if we haven't already detached
System.err.println(e.getMessage());
exitOrFail(3, "Exception encountered during startup: " + e.getMessage());
exitOrFail(StartupException.ERR_WRONG_DISK_STATE, "Exception encountered during startup: " + e.getMessage());
}
}
}