Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
issue JPPF-526 - deprecated or removed recovery port and reaper run i…
…nterval where required
- Loading branch information
Showing
13 changed files
with
1,027 additions
and
1,043 deletions.
There are no files selected for viewing
444 changes: 222 additions & 222 deletions
444
common/src/java/org/jppf/comm/discovery/JPPFConnectionInformation.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
908 changes: 452 additions & 456 deletions
908
common/src/java/org/jppf/utils/configuration/JPPFProperties.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 55 additions & 52 deletions
107
node/src/java/org/jppf/node/connection/ConnectionReason.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,55 @@ | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2017 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jppf.node.connection; | ||
|
|
||
| /** | ||
| * This enum lists the possible high-level reasons for a node reconnection request. | ||
| * @author Laurent Cohen | ||
| * @since 4.1 | ||
| */ | ||
| public enum ConnectionReason | ||
| { | ||
| /** | ||
| * Indicates the first connection attempt when the node starts up. | ||
| */ | ||
| INITIAL_CONNECTION_REQUEST, | ||
| /** | ||
| * A reconnection was requested via the management APIs or admin console. | ||
| */ | ||
| MANAGEMENT_REQUEST, | ||
| /** | ||
| * An error occurred while initializing the class loader connection. | ||
| */ | ||
| CLASSLOADER_INIT_ERROR, | ||
| /** | ||
| * An error occurred while processing a class loader request. | ||
| */ | ||
| CLASSLOADER_PROCESSING_ERROR, | ||
| /** | ||
| * An error occurred during the job channel initialization. | ||
| */ | ||
| JOB_CHANNEL_INIT_ERROR, | ||
| /** | ||
| * An error occurred on the job channel while processing a job. | ||
| */ | ||
| JOB_CHANNEL_PROCESSING_ERROR | ||
| } | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2017 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jppf.node.connection; | ||
|
|
||
| /** | ||
| * This enum lists the possible high-level reasons for a node reconnection request. | ||
| * @author Laurent Cohen | ||
| * @since 4.1 | ||
| */ | ||
| public enum ConnectionReason { | ||
| /** | ||
| * Indicates the first connection attempt when the node starts up. | ||
| */ | ||
| INITIAL_CONNECTION_REQUEST, | ||
| /** | ||
| * A reconnection was requested via the management APIs or admin console. | ||
| */ | ||
| MANAGEMENT_REQUEST, | ||
| /** | ||
| * An error occurred while initializing the class loader connection. | ||
| */ | ||
| CLASSLOADER_INIT_ERROR, | ||
| /** | ||
| * An error occurred while processing a class loader request. | ||
| */ | ||
| CLASSLOADER_PROCESSING_ERROR, | ||
| /** | ||
| * An error occurred during the job channel initialization. | ||
| */ | ||
| JOB_CHANNEL_INIT_ERROR, | ||
| /** | ||
| * An error occurred on the job channel while processing a job. | ||
| */ | ||
| JOB_CHANNEL_PROCESSING_ERROR, | ||
| /** | ||
| * The heartbeat mechanism failed to receive a message from the server in a configured time frame. | ||
| */ | ||
| HEARTBEAT_FAILURE | ||
| } |
108 changes: 58 additions & 50 deletions
108
node/src/java/org/jppf/node/connection/DriverConnectionInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,58 @@ | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2017 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jppf.node.connection; | ||
|
|
||
| /** | ||
| * This interface provides the required information for connecting to a remote JPPF driver. | ||
| * @author Laurent Cohen | ||
| * @since 4.1 | ||
| */ | ||
| public interface DriverConnectionInfo { | ||
| /** | ||
| * Determine whether secure (with SSL/TLS) connections should be established. | ||
| * @return {@code true} for secure connections, {@code false} otherwise. | ||
| */ | ||
| boolean isSecure(); | ||
|
|
||
| /** | ||
| * Get the driver host name or IP address. | ||
| * @return the host as a string. | ||
| */ | ||
| String getHost(); | ||
|
|
||
| /** | ||
| * Get the driver port to connect to. | ||
| * @return the driver port as an int value. | ||
| */ | ||
| int getPort(); | ||
|
|
||
| /** | ||
| * Get the recovery port for the heartbeat mechanism. | ||
| * @return the recovery port a an int; a negative value indicates that recovery is disabled for the node. | ||
| */ | ||
| int getRecoveryPort(); | ||
| } | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2017 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jppf.node.connection; | ||
|
|
||
| /** | ||
| * This interface provides the required information for connecting to a remote JPPF driver. | ||
| * @author Laurent Cohen | ||
| * @since 4.1 | ||
| */ | ||
| public interface DriverConnectionInfo { | ||
| /** | ||
| * Determine whether secure (with SSL/TLS) connections should be established. | ||
| * @return {@code true} for secure connections, {@code false} otherwise. | ||
| */ | ||
| boolean isSecure(); | ||
|
|
||
| /** | ||
| * Get the driver host name or IP address. | ||
| * @return the host as a string. | ||
| */ | ||
| String getHost(); | ||
|
|
||
| /** | ||
| * Get the driver port to connect to. | ||
| * @return the driver port as an int value. | ||
| */ | ||
| int getPort(); | ||
|
|
||
| /** | ||
| * Get the recovery port for the heartbeat mechanism. | ||
| * @return the recovery port a an int; a negative value indicates that recovery is disabled for the node. | ||
| * @deprecated as of JPPF 6.0, the recovery mechanism uses the same port number as the main server port. | ||
| * This method will return {@code -1} if recovery is disabled, or the value of {@link #getPort()} if it is enabled. | ||
| */ | ||
| int getRecoveryPort(); | ||
|
|
||
| /** | ||
| * Determine whether the recovery mechanism (exchange of heartbeat messages) is enabled. | ||
| * @return {@code true} if recovery is enabled, {@code false} otherwise. | ||
| */ | ||
| boolean isRecoveryEnabled(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.