http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java deleted file mode 100644 index ec16cf9..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi; - -import org.apache.ignite.mxbean.*; - -import java.util.*; - -/** - * This interface defines basic MBean for all SPI implementations. Every SPI implementation - * should provide implementation for this MBean interface. Note that SPI implementation can extend this - * interface as necessary. - */ -public interface IgniteSpiManagementMBean { - /** - * Gets string presentation of the start timestamp. - * - * @return String presentation of the start timestamp. - */ - @IgniteMXBeanDescription("String presentation of the start timestamp.") - public String getStartTimestampFormatted(); - - /** - * Gets string presentation of up-time for this SPI. - * - * @return String presentation of up-time for this SPI. - */ - @IgniteMXBeanDescription("String presentation of up-time for this SPI.") - public String getUpTimeFormatted(); - - /** - * Get start timestamp of this SPI. - * - * @return Start timestamp of this SPI. - */ - @IgniteMXBeanDescription("Start timestamp of this SPI.") - public long getStartTimestamp(); - - /** - * Gets up-time of this SPI in ms. - * - * @return Up-time of this SPI. - */ - @IgniteMXBeanDescription("Up-time of this SPI in milliseconds.") - public long getUpTime(); - - /** - * Gets Gridgain installation home folder (i.e. ${GRIDGAIN_HOME}); - * - * @return Gridgain installation home folder. - */ - @IgniteMXBeanDescription("Gridgain installation home folder.") - public String getGridGainHome(); - - /** - * Gets ID of the local node. - * - * @return ID of the local node. - */ - @IgniteMXBeanDescription("ID of the local node.") - public UUID getLocalNodeId(); - - /** - * Gets name of the SPI. - * - * @return Name of the SPI. - */ - @IgniteMXBeanDescription("Name of the SPI.") - public String getName(); -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMXBean.java new file mode 100644 index 0000000..6a6b5b4 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMXBean.java @@ -0,0 +1,85 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi; + +import org.apache.ignite.mxbean.*; + +import java.util.*; + +/** + * This interface defines basic MXBean for all SPI implementations. Every SPI implementation + * should provide implementation for this MXBean interface. Note that SPI implementation can extend this + * interface as necessary. + */ +public interface IgniteSpiManagementMXBean { + /** + * Gets string presentation of the start timestamp. + * + * @return String presentation of the start timestamp. + */ + @IgniteMXBeanDescription("String presentation of the start timestamp.") + public String getStartTimestampFormatted(); + + /** + * Gets string presentation of up-time for this SPI. + * + * @return String presentation of up-time for this SPI. + */ + @IgniteMXBeanDescription("String presentation of up-time for this SPI.") + public String getUpTimeFormatted(); + + /** + * Get start timestamp of this SPI. + * + * @return Start timestamp of this SPI. + */ + @IgniteMXBeanDescription("Start timestamp of this SPI.") + public long getStartTimestamp(); + + /** + * Gets up-time of this SPI in ms. + * + * @return Up-time of this SPI. + */ + @IgniteMXBeanDescription("Up-time of this SPI in milliseconds.") + public long getUpTime(); + + /** + * Gets Gridgain installation home folder (i.e. ${GRIDGAIN_HOME}); + * + * @return Gridgain installation home folder. + */ + @IgniteMXBeanDescription("Gridgain installation home folder.") + public String getGridGainHome(); + + /** + * Gets ID of the local node. + * + * @return ID of the local node. + */ + @IgniteMXBeanDescription("ID of the local node.") + public UUID getLocalNodeId(); + + /** + * Gets name of the SPI. + * + * @return Name of the SPI. + */ + @IgniteMXBeanDescription("Name of the SPI.") + public String getName(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java index ec3347f..e4c939a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java @@ -66,7 +66,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; @IgniteSpiNoop @IgniteSpiMultipleInstancesSupport(true) public class NoopAuthenticationSpi extends IgniteSpiAdapter - implements AuthenticationSpi, NoopAuthenticationSpiMBean { + implements AuthenticationSpi, NoopAuthenticationSpiMXBean { /** Injected grid logger. */ @IgniteLoggerResource @GridToStringExclude @@ -104,7 +104,7 @@ public class NoopAuthenticationSpi extends IgniteSpiAdapter // Start SPI start stopwatch. startStopwatch(); - registerMBean(gridName, this, NoopAuthenticationSpiMBean.class); + registerMXBean(gridName, this, NoopAuthenticationSpiMXBean.class); // Ack ok start. if (log.isDebugEnabled()) @@ -113,7 +113,7 @@ public class NoopAuthenticationSpi extends IgniteSpiAdapter /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - unregisterMBean(); + unregisterMXBean(); // Ack ok stop. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java deleted file mode 100644 index c0e54e9..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.authentication.noop; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -/** - * Management bean for {@link NoopAuthenticationSpi}. - */ -@IgniteMXBeanDescription("MBean that provides access to no-op authentication SPI configuration.") -public interface NoopAuthenticationSpiMBean extends IgniteSpiManagementMBean { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMXBean.java new file mode 100644 index 0000000..e685b39 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMXBean.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.authentication.noop; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +/** + * Management bean for {@link NoopAuthenticationSpi}. + */ +@IgniteMXBeanDescription("MXBean that provides access to no-op authentication SPI configuration.") +public interface NoopAuthenticationSpiMXBean extends IgniteSpiManagementMXBean { + // No-op. +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java index 39b3565..4d96598 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java @@ -92,7 +92,7 @@ import static org.apache.ignite.events.IgniteEventType.*; * @see org.apache.ignite.spi.checkpoint.CheckpointSpi */ @IgniteSpiMultipleInstancesSupport(true) -public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, CacheCheckpointSpiMBean { +public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, CacheCheckpointSpiMXBean { /** Default cache name (value is <tt>checkpoints</tt>). */ public static final String DFLT_CACHE_NAME = "checkpoints"; @@ -137,7 +137,7 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp if (log.isDebugEnabled()) log.debug(configInfo("cacheName", cacheName)); - registerMBean(gridName, this, CacheCheckpointSpiMBean.class); + registerMXBean(gridName, this, CacheCheckpointSpiMXBean.class); if (log.isDebugEnabled()) log.debug(startInfo()); @@ -168,7 +168,7 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - unregisterMBean(); + unregisterMXBean(); // Ack ok stop. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java deleted file mode 100644 index 7ff7118..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.cache; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -/** - * Management bean that provides general administrative and configuration information - * about cache checkpoint SPI. - * - * - */ -@IgniteMXBeanDescription("MBean provides information about cache checkpoint SPI.") -public interface CacheCheckpointSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets cache name to be used by this SPI.. - * - * @return Cache name to be used by this SPI. - */ - @IgniteMXBeanDescription("Cache name to be used by this SPI.") - public String getCacheName(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMXBean.java new file mode 100644 index 0000000..de1d470 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMXBean.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.cache; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +/** + * Management bean that provides general administrative and configuration information + * about cache checkpoint SPI. + */ +@IgniteMXBeanDescription("MXBean provides information about cache checkpoint SPI.") +public interface CacheCheckpointSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets cache name to be used by this SPI.. + * + * @return Cache name to be used by this SPI. + */ + @IgniteMXBeanDescription("Cache name to be used by this SPI.") + public String getCacheName(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java index 8f3f630..c915645 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java @@ -102,7 +102,7 @@ import java.text.*; */ @SuppressWarnings({"JDBCResourceOpenedButNotSafelyClosed", "JDBCExecuteWithNonConstantString"}) @IgniteSpiMultipleInstancesSupport(true) -public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, JdbcCheckpointSpiMBean { +public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, JdbcCheckpointSpiMXBean { /** Default number of retries in case of errors (value is {@code 2}). */ public static final int DFLT_NUMBER_OF_RETRIES = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java deleted file mode 100644 index 930cde5..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.jdbc; - - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -/** - * Management bean that provides general administrative and configuration information - * about jdbc checkpoint SPI. - */ -@IgniteMXBeanDescription("MBean that provides information about jdbc checkpoint SPI.") -public interface JdbcCheckpointSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets number of retries in case of DB failure. - * - * @return Number of retries. - */ - @IgniteMXBeanDescription("Number of retries.") - public int getNumberOfRetries(); - - /** - * Gets data source description. - * - * @return Description for data source. - */ - @IgniteMXBeanDescription("Data source description.") - public String getDataSourceInfo(); - - /** - * Gets checkpoint jdbc user name. - * - * @return User name for checkpoint jdbc. - */ - @IgniteMXBeanDescription("User name for checkpoint database.") - public String getUser(); - - /** - * Gets checkpoint jdbc password. - * - * @return Password for checkpoint jdbc. - */ - @IgniteMXBeanDescription("Password for checkpoint database.") - public String getPwd(); - - /** - * Gets checkpoint table name. - * - * @return Checkpoint table name. - */ - @IgniteMXBeanDescription("Checkpoint table name.") - public String getCheckpointTableName(); - - /** - * Gets key field name for checkpoint table. - * - * @return Key field name for checkpoint table. - */ - @IgniteMXBeanDescription("Key field name for checkpoint table.") - public String getKeyFieldName(); - - /** - * Gets key field type for checkpoint table. - * - * @return Key field type for checkpoint table. - */ - @IgniteMXBeanDescription("Key field type for checkpoint table.") - public String getKeyFieldType(); - - /** - * Gets value field name for checkpoint table. - * - * @return Value field name for checkpoint table. - */ - @IgniteMXBeanDescription("Value field name for checkpoint table.") - public String getValueFieldName(); - - /** - * Gets value field type for checkpoint table. - * - * @return Value field type for checkpoint table. - */ - @IgniteMXBeanDescription("Value field type for checkpoint table.") - public String getValueFieldType(); - - /** - * Gets expiration date field name for checkpoint table. - * - * @return Create date field name for checkpoint table. - */ - @IgniteMXBeanDescription("Expiration date field name for checkpoint table.") - public String getExpireDateFieldName(); - - /** - * Gets expiration date field type for checkpoint table. - * - * @return Expiration date field type for checkpoint table. - */ - @IgniteMXBeanDescription("Expiration date field type for checkpoint table.") - public String getExpireDateFieldType(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMXBean.java new file mode 100644 index 0000000..68b9e89 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMXBean.java @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.jdbc; + + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +/** + * Management bean that provides general administrative and configuration information + * about jdbc checkpoint SPI. + */ +@IgniteMXBeanDescription("MXBean that provides information about jdbc checkpoint SPI.") +public interface JdbcCheckpointSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets number of retries in case of DB failure. + * + * @return Number of retries. + */ + @IgniteMXBeanDescription("Number of retries.") + public int getNumberOfRetries(); + + /** + * Gets data source description. + * + * @return Description for data source. + */ + @IgniteMXBeanDescription("Data source description.") + public String getDataSourceInfo(); + + /** + * Gets checkpoint jdbc user name. + * + * @return User name for checkpoint jdbc. + */ + @IgniteMXBeanDescription("User name for checkpoint database.") + public String getUser(); + + /** + * Gets checkpoint jdbc password. + * + * @return Password for checkpoint jdbc. + */ + @IgniteMXBeanDescription("Password for checkpoint database.") + public String getPwd(); + + /** + * Gets checkpoint table name. + * + * @return Checkpoint table name. + */ + @IgniteMXBeanDescription("Checkpoint table name.") + public String getCheckpointTableName(); + + /** + * Gets key field name for checkpoint table. + * + * @return Key field name for checkpoint table. + */ + @IgniteMXBeanDescription("Key field name for checkpoint table.") + public String getKeyFieldName(); + + /** + * Gets key field type for checkpoint table. + * + * @return Key field type for checkpoint table. + */ + @IgniteMXBeanDescription("Key field type for checkpoint table.") + public String getKeyFieldType(); + + /** + * Gets value field name for checkpoint table. + * + * @return Value field name for checkpoint table. + */ + @IgniteMXBeanDescription("Value field name for checkpoint table.") + public String getValueFieldName(); + + /** + * Gets value field type for checkpoint table. + * + * @return Value field type for checkpoint table. + */ + @IgniteMXBeanDescription("Value field type for checkpoint table.") + public String getValueFieldType(); + + /** + * Gets expiration date field name for checkpoint table. + * + * @return Create date field name for checkpoint table. + */ + @IgniteMXBeanDescription("Expiration date field name for checkpoint table.") + public String getExpireDateFieldName(); + + /** + * Gets expiration date field type for checkpoint table. + * + * @return Expiration date field type for checkpoint table. + */ + @IgniteMXBeanDescription("Expiration date field type for checkpoint table.") + public String getExpireDateFieldType(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java index c7f8c68..e1ee46f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java @@ -101,7 +101,7 @@ import java.util.*; @IgniteSpiMultipleInstancesSupport(true) @IgniteSpiConsistencyChecked(optional = false) public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, - SharedFsCheckpointSpiMBean { + SharedFsCheckpointSpiMXBean { /** * Default checkpoint directory. Note that this path is relative to {@code GRIDGAIN_HOME/work} folder * if {@code GRIDGAIN_HOME} system or environment variable specified, otherwise it is relative to @@ -201,7 +201,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin if (!folder.isDirectory()) throw new IgniteSpiException("Checkpoint directory path is not a valid directory: " + curDirPath); - registerMBean(gridName, this, SharedFsCheckpointSpiMBean.class); + registerMXBean(gridName, this, SharedFsCheckpointSpiMXBean.class); // Ack parameters. if (log.isDebugEnabled()) { @@ -228,7 +228,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin U.join(timeoutTask, log); } - unregisterMBean(); + unregisterMXBean(); // Clean resources. folder = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java deleted file mode 100644 index 2ef4634..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.sharedfs; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -import java.util.*; - -/** - * Management bean that provides general administrative and configuration information - * about shared file system checkpoints. - */ -@IgniteMXBeanDescription("MBean for shared file system based checkpoint SPI.") -public interface SharedFsCheckpointSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets path to the directory where all checkpoints are saved. - * - * @return Path to the checkpoints directory. - */ - @IgniteMXBeanDescription("Gets path to the directory where all checkpoints are saved.") - public String getCurrentDirectoryPath(); - - - /** - * Gets collection of all configured paths where checkpoints can be saved. - * - * @return Collection of all configured paths. - */ - @IgniteMXBeanDescription("Gets collection of all configured paths where checkpoints can be saved.") - public Collection<String> getDirectoryPaths(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMXBean.java new file mode 100644 index 0000000..1b16a70 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMXBean.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.checkpoint.sharedfs; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +import java.util.*; + +/** + * Management bean that provides general administrative and configuration information + * about shared file system checkpoints. + */ +@IgniteMXBeanDescription("MXBean for shared file system based checkpoint SPI.") +public interface SharedFsCheckpointSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets path to the directory where all checkpoints are saved. + * + * @return Path to the checkpoints directory. + */ + @IgniteMXBeanDescription("Gets path to the directory where all checkpoints are saved.") + public String getCurrentDirectoryPath(); + + + /** + * Gets collection of all configured paths where checkpoints can be saved. + * + * @return Collection of all configured paths. + */ + @IgniteMXBeanDescription("Gets collection of all configured paths where checkpoints can be saved.") + public Collection<String> getDirectoryPaths(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java index e05abf4..7debfb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java @@ -72,7 +72,7 @@ import java.util.*; */ @IgniteSpiMultipleInstancesSupport(true) public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements CollisionSpi, - FifoQueueCollisionSpiMBean { + FifoQueueCollisionSpiMXBean { /** * Default number of parallel jobs allowed (value is {@code 95} which is * slightly less same as default value of threads in the execution thread pool @@ -163,7 +163,7 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision if (log.isDebugEnabled()) log.debug(configInfo("parallelJobsNum", parallelJobsNum)); - registerMBean(gridName, this, FifoQueueCollisionSpiMBean.class); + registerMXBean(gridName, this, FifoQueueCollisionSpiMXBean.class); // Ack start. if (log.isDebugEnabled()) @@ -172,7 +172,7 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - unregisterMBean(); + unregisterMXBean(); // Ack ok stop. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java deleted file mode 100644 index ccf56c0..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.collision.fifoqueue; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -/** - * Management bean that provides access to the FIFO queue collision SPI configuration. - */ -@IgniteMXBeanDescription("MBean provides information about FIFO queue based collision SPI configuration.") -public interface FifoQueueCollisionSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets number of jobs that can be executed in parallel. - * - * @return Number of jobs that can be executed in parallel. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public int getParallelJobsNumber(); - - /** - * Sets number of jobs that can be executed in parallel. - * - * @param num Parallel jobs number. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public void setParallelJobsNumber(int num); - - /** - * Maximum number of jobs that are allowed to wait in waiting queue. If number - * of waiting jobs ever exceeds this number, excessive jobs will be rejected. - * - * @return Maximum allowed number of waiting jobs. - */ - @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") - public int getWaitingJobsNumber(); - - /** - * Sets maximum number of jobs that are allowed to wait in waiting queue. If number - * of waiting jobs ever exceeds this number, excessive jobs will be rejected. - * - * @param num Waiting jobs number. - */ - @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") - public void setWaitingJobsNumber(int num); - - /** - * Gets current number of jobs that wait for the execution. - * - * @return Number of jobs that wait for execution. - */ - @IgniteMXBeanDescription("Number of jobs that wait for execution.") - public int getCurrentWaitJobsNumber(); - - /** - * Gets current number of jobs that are active, i.e. {@code 'running + held'} jobs. - * - * @return Number of active jobs. - */ - @IgniteMXBeanDescription("Number of active jobs.") - public int getCurrentActiveJobsNumber(); - - /* - * Gets number of currently running (not {@code 'held}) jobs. - * - * @return Number of currently running (not {@code 'held}) jobs. - */ - @IgniteMXBeanDescription("Number of running jobs.") - public int getCurrentRunningJobsNumber(); - - /** - * Gets number of currently {@code 'held'} jobs. - * - * @return Number of currently {@code 'held'} jobs. - */ - @IgniteMXBeanDescription("Number of held jobs.") - public int getCurrentHeldJobsNumber(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMXBean.java new file mode 100644 index 0000000..1f31a01 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMXBean.java @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.collision.fifoqueue; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +/** + * Management bean that provides access to the FIFO queue collision SPI configuration. + */ +@IgniteMXBeanDescription("MXBean provides information about FIFO queue based collision SPI configuration.") +public interface FifoQueueCollisionSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets number of jobs that can be executed in parallel. + * + * @return Number of jobs that can be executed in parallel. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public int getParallelJobsNumber(); + + /** + * Sets number of jobs that can be executed in parallel. + * + * @param num Parallel jobs number. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public void setParallelJobsNumber(int num); + + /** + * Maximum number of jobs that are allowed to wait in waiting queue. If number + * of waiting jobs ever exceeds this number, excessive jobs will be rejected. + * + * @return Maximum allowed number of waiting jobs. + */ + @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") + public int getWaitingJobsNumber(); + + /** + * Sets maximum number of jobs that are allowed to wait in waiting queue. If number + * of waiting jobs ever exceeds this number, excessive jobs will be rejected. + * + * @param num Waiting jobs number. + */ + @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") + public void setWaitingJobsNumber(int num); + + /** + * Gets current number of jobs that wait for the execution. + * + * @return Number of jobs that wait for execution. + */ + @IgniteMXBeanDescription("Number of jobs that wait for execution.") + public int getCurrentWaitJobsNumber(); + + /** + * Gets current number of jobs that are active, i.e. {@code 'running + held'} jobs. + * + * @return Number of active jobs. + */ + @IgniteMXBeanDescription("Number of active jobs.") + public int getCurrentActiveJobsNumber(); + + /* + * Gets number of currently running (not {@code 'held}) jobs. + * + * @return Number of currently running (not {@code 'held}) jobs. + */ + @IgniteMXBeanDescription("Number of running jobs.") + public int getCurrentRunningJobsNumber(); + + /** + * Gets number of currently {@code 'held'} jobs. + * + * @return Number of currently {@code 'held'} jobs. + */ + @IgniteMXBeanDescription("Number of held jobs.") + public int getCurrentHeldJobsNumber(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java index 8c59043..904429d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java @@ -164,7 +164,7 @@ import static org.apache.ignite.events.IgniteEventType.*; @IgniteSpiMultipleInstancesSupport(true) @IgniteSpiConsistencyChecked(optional = true) public class JobStealingCollisionSpi extends IgniteSpiAdapter implements CollisionSpi, - JobStealingCollisionSpiMBean { + JobStealingCollisionSpiMXBean { /** Maximum number of attempts to steal job by another node (default is {@code 5}). */ public static final int DFLT_MAX_STEALING_ATTEMPTS = 5; @@ -420,7 +420,7 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi log.debug(configInfo("maxStealingAttempts", maxStealingAttempts)); } - registerMBean(gridName, this, JobStealingCollisionSpiMBean.class); + registerMXBean(gridName, this, JobStealingCollisionSpiMXBean.class); // Ack start. if (log.isDebugEnabled()) @@ -429,7 +429,7 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - unregisterMBean(); + unregisterMXBean(); // Ack ok stop. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java deleted file mode 100644 index 6918542..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.collision.jobstealing; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -import java.io.*; -import java.util.*; - -/** - * Management MBean for job stealing based collision SPI. - */ -@IgniteMXBeanDescription("MBean for job stealing based collision SPI.") -public interface JobStealingCollisionSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets current number of jobs to be stolen. This is outstanding - * requests number. - * - * @return Number of jobs to be stolen. - */ - @IgniteMXBeanDescription("Number of jobs to be stolen.") - public int getCurrentJobsToStealNumber(); - - /** - * Gets current number of jobs that wait for the execution. - * - * @return Number of jobs that wait for execution. - */ - @IgniteMXBeanDescription("Number of jobs that wait for execution.") - public int getCurrentWaitJobsNumber(); - - /** - * Gets current number of jobs that are being executed. - * - * @return Number of active jobs. - */ - @IgniteMXBeanDescription("Number of active jobs.") - public int getCurrentActiveJobsNumber(); - - /* - * Gets number of currently running (not {@code 'held}) jobs. - * - * @return Number of currently running (not {@code 'held}) jobs. - */ - @IgniteMXBeanDescription("Number of running jobs.") - public int getCurrentRunningJobsNumber(); - - /** - * Gets number of currently {@code 'held'} jobs. - * - * @return Number of currently {@code 'held'} jobs. - */ - @IgniteMXBeanDescription("Number of held jobs.") - public int getCurrentHeldJobsNumber(); - - /** - * Gets total number of stolen jobs. - * - * @return Number of stolen jobs. - */ - @IgniteMXBeanDescription("Number of stolen jobs.") - public int getTotalStolenJobsNumber(); - - /** - * Gets number of jobs that can be executed in parallel. - * - * @return Number of jobs that can be executed in parallel. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public int getActiveJobsThreshold(); - - /** - * Sets number of jobs that can be executed in parallel. - * - * @param activeJobsTreshold Number of jobs that can be executed in parallel. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public void setActiveJobsThreshold(int activeJobsTreshold); - - /** - * Gets job count threshold at which this node will - * start stealing jobs from other nodes. - * - * @return Job count threshold. - */ - @IgniteMXBeanDescription("Job count threshold.") - public int getWaitJobsThreshold(); - - /** - * Sets job count threshold at which this node will - * start stealing jobs from other nodes. - * - * @param waitJobsThreshold Job count threshold. - */ - @IgniteMXBeanDescription("Job count threshold.") - public void setWaitJobsThreshold(int waitJobsThreshold); - - /** - * Message expire time configuration parameter. If no response is received - * from a busy node to a job stealing message, then implementation will - * assume that message never got there, or that remote node does not have - * this node included into topology of any of the jobs it has. - * - * @return Message expire time. - */ - @IgniteMXBeanDescription("Message expire time.") - public long getMessageExpireTime(); - - /** - * Message expire time configuration parameter. If no response is received - * from a busy node to a job stealing message, then implementation will - * assume that message never got there, or that remote node does not have - * this node included into topology of any of the jobs it has. - * - * @param msgExpireTime Message expire time. - */ - @IgniteMXBeanDescription("Message expire time.") - public void setMessageExpireTime(long msgExpireTime); - - /** - * Gets flag indicating whether this node should attempt to steal jobs - * from other nodes. If {@code false}, then this node will steal allow - * jobs to be stolen from it, but won't attempt to steal any jobs from - * other nodes. - * <p> - * Default value is {@code true}. - * - * @return Flag indicating whether this node should attempt to steal jobs - * from other nodes. - */ - @IgniteMXBeanDescription("Flag indicating whether this node should attempt to steal jobs from other nodes.") - public boolean isStealingEnabled(); - - /** - * Gets flag indicating whether this node should attempt to steal jobs - * from other nodes. If {@code false}, then this node will steal allow - * jobs to be stolen from it, but won't attempt to steal any jobs from - * other nodes. - * <p> - * Default value is {@code true}. - * - * @param stealingEnabled Flag indicating whether this node should attempt to steal jobs - * from other nodes. - */ - @IgniteMXBeanDescription("Flag indicating whether this node should attempt to steal jobs from other nodes.") - public void setStealingEnabled(boolean stealingEnabled); - - /** - * Gets maximum number of attempts to steal job by another node. - * If not specified, {@link JobStealingCollisionSpi#DFLT_MAX_STEALING_ATTEMPTS} - * value will be used. - * - * @return Maximum number of attempts to steal job by another node. - */ - @IgniteMXBeanDescription("Maximum number of attempts to steal job by another node.") - public int getMaximumStealingAttempts(); - - /** - * Gets maximum number of attempts to steal job by another node. - * If not specified, {@link JobStealingCollisionSpi#DFLT_MAX_STEALING_ATTEMPTS} - * value will be used. - * - * @param maximumStealingAttempts Maximum number of attempts to steal job by another node. - */ - @IgniteMXBeanDescription("Maximum number of attempts to steal job by another node.") - public void setMaximumStealingAttempts(int maximumStealingAttempts); - - /** - * Configuration parameter to enable stealing to/from only nodes that - * have these attributes set (see {@link org.apache.ignite.cluster.ClusterNode#attribute(String)} and - * {@link org.apache.ignite.configuration.IgniteConfiguration#getUserAttributes()} methods). - * - * @return Node attributes to enable job stealing for. - */ - @IgniteMXBeanDescription("Node attributes to enable job stealing for.") - public Map<String, ? extends Serializable> getStealingAttributes(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMXBean.java new file mode 100644 index 0000000..10c2d04 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMXBean.java @@ -0,0 +1,193 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.collision.jobstealing; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +import java.io.*; +import java.util.*; + +/** + * Management MBean for job stealing based collision SPI. + */ +@IgniteMXBeanDescription("MXBean for job stealing based collision SPI.") +public interface JobStealingCollisionSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets current number of jobs to be stolen. This is outstanding + * requests number. + * + * @return Number of jobs to be stolen. + */ + @IgniteMXBeanDescription("Number of jobs to be stolen.") + public int getCurrentJobsToStealNumber(); + + /** + * Gets current number of jobs that wait for the execution. + * + * @return Number of jobs that wait for execution. + */ + @IgniteMXBeanDescription("Number of jobs that wait for execution.") + public int getCurrentWaitJobsNumber(); + + /** + * Gets current number of jobs that are being executed. + * + * @return Number of active jobs. + */ + @IgniteMXBeanDescription("Number of active jobs.") + public int getCurrentActiveJobsNumber(); + + /* + * Gets number of currently running (not {@code 'held}) jobs. + * + * @return Number of currently running (not {@code 'held}) jobs. + */ + @IgniteMXBeanDescription("Number of running jobs.") + public int getCurrentRunningJobsNumber(); + + /** + * Gets number of currently {@code 'held'} jobs. + * + * @return Number of currently {@code 'held'} jobs. + */ + @IgniteMXBeanDescription("Number of held jobs.") + public int getCurrentHeldJobsNumber(); + + /** + * Gets total number of stolen jobs. + * + * @return Number of stolen jobs. + */ + @IgniteMXBeanDescription("Number of stolen jobs.") + public int getTotalStolenJobsNumber(); + + /** + * Gets number of jobs that can be executed in parallel. + * + * @return Number of jobs that can be executed in parallel. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public int getActiveJobsThreshold(); + + /** + * Sets number of jobs that can be executed in parallel. + * + * @param activeJobsTreshold Number of jobs that can be executed in parallel. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public void setActiveJobsThreshold(int activeJobsTreshold); + + /** + * Gets job count threshold at which this node will + * start stealing jobs from other nodes. + * + * @return Job count threshold. + */ + @IgniteMXBeanDescription("Job count threshold.") + public int getWaitJobsThreshold(); + + /** + * Sets job count threshold at which this node will + * start stealing jobs from other nodes. + * + * @param waitJobsThreshold Job count threshold. + */ + @IgniteMXBeanDescription("Job count threshold.") + public void setWaitJobsThreshold(int waitJobsThreshold); + + /** + * Message expire time configuration parameter. If no response is received + * from a busy node to a job stealing message, then implementation will + * assume that message never got there, or that remote node does not have + * this node included into topology of any of the jobs it has. + * + * @return Message expire time. + */ + @IgniteMXBeanDescription("Message expire time.") + public long getMessageExpireTime(); + + /** + * Message expire time configuration parameter. If no response is received + * from a busy node to a job stealing message, then implementation will + * assume that message never got there, or that remote node does not have + * this node included into topology of any of the jobs it has. + * + * @param msgExpireTime Message expire time. + */ + @IgniteMXBeanDescription("Message expire time.") + public void setMessageExpireTime(long msgExpireTime); + + /** + * Gets flag indicating whether this node should attempt to steal jobs + * from other nodes. If {@code false}, then this node will steal allow + * jobs to be stolen from it, but won't attempt to steal any jobs from + * other nodes. + * <p> + * Default value is {@code true}. + * + * @return Flag indicating whether this node should attempt to steal jobs + * from other nodes. + */ + @IgniteMXBeanDescription("Flag indicating whether this node should attempt to steal jobs from other nodes.") + public boolean isStealingEnabled(); + + /** + * Gets flag indicating whether this node should attempt to steal jobs + * from other nodes. If {@code false}, then this node will steal allow + * jobs to be stolen from it, but won't attempt to steal any jobs from + * other nodes. + * <p> + * Default value is {@code true}. + * + * @param stealingEnabled Flag indicating whether this node should attempt to steal jobs + * from other nodes. + */ + @IgniteMXBeanDescription("Flag indicating whether this node should attempt to steal jobs from other nodes.") + public void setStealingEnabled(boolean stealingEnabled); + + /** + * Gets maximum number of attempts to steal job by another node. + * If not specified, {@link JobStealingCollisionSpi#DFLT_MAX_STEALING_ATTEMPTS} + * value will be used. + * + * @return Maximum number of attempts to steal job by another node. + */ + @IgniteMXBeanDescription("Maximum number of attempts to steal job by another node.") + public int getMaximumStealingAttempts(); + + /** + * Gets maximum number of attempts to steal job by another node. + * If not specified, {@link JobStealingCollisionSpi#DFLT_MAX_STEALING_ATTEMPTS} + * value will be used. + * + * @param maximumStealingAttempts Maximum number of attempts to steal job by another node. + */ + @IgniteMXBeanDescription("Maximum number of attempts to steal job by another node.") + public void setMaximumStealingAttempts(int maximumStealingAttempts); + + /** + * Configuration parameter to enable stealing to/from only nodes that + * have these attributes set (see {@link org.apache.ignite.cluster.ClusterNode#attribute(String)} and + * {@link org.apache.ignite.configuration.IgniteConfiguration#getUserAttributes()} methods). + * + * @return Node attributes to enable job stealing for. + */ + @IgniteMXBeanDescription("Node attributes to enable job stealing for.") + public Map<String, ? extends Serializable> getStealingAttributes(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java index b27b928..2519b89 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java @@ -160,7 +160,7 @@ import java.util.*; @IgniteSpiMultipleInstancesSupport(true) @IgniteSpiConsistencyChecked(optional = true) public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements CollisionSpi, - PriorityQueueCollisionSpiMBean { + PriorityQueueCollisionSpiMXBean { /** * Default number of parallel jobs allowed (value is {@code 95} which is * slightly less same as default value of threads in the execution thread pool @@ -373,7 +373,7 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli log.debug(configInfo("preventStarvation", preventStarvation)); } - registerMBean(gridName, this, PriorityQueueCollisionSpiMBean.class); + registerMXBean(gridName, this, PriorityQueueCollisionSpiMXBean.class); // Ack start. if (log.isDebugEnabled()) @@ -382,7 +382,7 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - unregisterMBean(); + unregisterMXBean(); // Ack ok stop. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java deleted file mode 100644 index d16dc8f..0000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.apache.ignite.spi.collision.priorityqueue; - -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; - -/** - * Management bean that provides access to the priority queue collision SPI configuration. - */ -@IgniteMXBeanDescription("MBean provides access to the priority queue collision SPI.") -public interface PriorityQueueCollisionSpiMBean extends IgniteSpiManagementMBean { - /** - * Gets current number of jobs that wait for the execution. - * - * @return Number of jobs that wait for execution. - */ - @IgniteMXBeanDescription("Number of jobs that wait for execution.") - public int getCurrentWaitJobsNumber(); - - /** - * Gets current number of jobs that are active, i.e. {@code 'running + held'} jobs. - * - * @return Number of active jobs. - */ - @IgniteMXBeanDescription("Number of active jobs.") - public int getCurrentActiveJobsNumber(); - - /* - * Gets number of currently running (not {@code 'held}) jobs. - * - * @return Number of currently running (not {@code 'held}) jobs. - */ - @IgniteMXBeanDescription("Number of running jobs.") - public int getCurrentRunningJobsNumber(); - - /** - * Gets number of currently {@code 'held'} jobs. - * - * @return Number of currently {@code 'held'} jobs. - */ - @IgniteMXBeanDescription("Number of held jobs.") - public int getCurrentHeldJobsNumber(); - - /** - * Gets number of jobs that can be executed in parallel. - * - * @return Number of jobs that can be executed in parallel. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public int getParallelJobsNumber(); - - /** - * Sets number of jobs that can be executed in parallel. - * - * @param num Parallel jobs number. - */ - @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") - public void setParallelJobsNumber(int num); - - /** - * Maximum number of jobs that are allowed to wait in waiting queue. If number - * of waiting jobs ever exceeds this number, excessive jobs will be rejected. - * - * @return Maximum allowed number of waiting jobs. - */ - @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") - public int getWaitingJobsNumber(); - - /** - * Maximum number of jobs that are allowed to wait in waiting queue. If number - * of waiting jobs ever exceeds this number, excessive jobs will be rejected. - * - * @param num Maximium jobs number. - */ - @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") - public void setWaitingJobsNumber(int num); - - /** - * Gets key name of task priority attribute. - * - * @return Key name of task priority attribute. - */ - @IgniteMXBeanDescription("Key name of task priority attribute.") - public String getPriorityAttributeKey(); - - /** - * Gets key name of job priority attribute. - * - * @return Key name of job priority attribute. - */ - @IgniteMXBeanDescription("Key name of job priority attribute.") - public String getJobPriorityAttributeKey(); - - /** - * Gets default priority to use if a job does not have priority attribute - * set. - * - * @return Default priority to use if a task does not have priority - * attribute set. - */ - @IgniteMXBeanDescription("Default priority to use if a task does not have priority attribute set.") - public int getDefaultPriority(); - - /** - * Sets default priority to use if a job does not have priority attribute set. - * - * @param priority default priority. - */ - @IgniteMXBeanDescription("Default priority to use if a task does not have priority attribute set.") - public void setDefaultPriority(int priority); - - /** - * Gets value to increment job priority by every time a lower priority job gets - * behind a higher priority job. - * - * @return Value to increment job priority by every time a lower priority job gets - * behind a higher priority job. - */ - @IgniteMXBeanDescription("Value to increment job priority by every time a lower priority job gets behind a higher priority job.") - public int getStarvationIncrement(); - - /** - * Sets value to increment job priority by every time a lower priority job gets - * behind a higher priority job. - * - * @param increment Increment value. - */ - @IgniteMXBeanDescription("Value to increment job priority by every time a lower priority job gets behind a higher priority job.") - public void setStarvationIncrement(int increment); - - /** - * Gets flag indicating whether job starvation prevention is enabled. - * - * @return Flag indicating whether job starvation prevention is enabled. - */ - @IgniteMXBeanDescription("Flag indicating whether job starvation prevention is enabled.") - public boolean isStarvationPreventionEnabled(); - - /** - * Sets flag indicating whether job starvation prevention is enabled. - * - * @param preventStarvation Flag indicating whether job starvation prevention is enabled. - */ - @IgniteMXBeanDescription("Flag indicating whether job starvation prevention is enabled.") - public void setStarvationPreventionEnabled(boolean preventStarvation); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java new file mode 100644 index 0000000..1ad7d78 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java @@ -0,0 +1,162 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.ignite.spi.collision.priorityqueue; + +import org.apache.ignite.mxbean.*; +import org.apache.ignite.spi.*; + +/** + * Management bean that provides access to the priority queue collision SPI configuration. + */ +@IgniteMXBeanDescription("MXBean provides access to the priority queue collision SPI.") +public interface PriorityQueueCollisionSpiMXBean extends IgniteSpiManagementMXBean { + /** + * Gets current number of jobs that wait for the execution. + * + * @return Number of jobs that wait for execution. + */ + @IgniteMXBeanDescription("Number of jobs that wait for execution.") + public int getCurrentWaitJobsNumber(); + + /** + * Gets current number of jobs that are active, i.e. {@code 'running + held'} jobs. + * + * @return Number of active jobs. + */ + @IgniteMXBeanDescription("Number of active jobs.") + public int getCurrentActiveJobsNumber(); + + /* + * Gets number of currently running (not {@code 'held}) jobs. + * + * @return Number of currently running (not {@code 'held}) jobs. + */ + @IgniteMXBeanDescription("Number of running jobs.") + public int getCurrentRunningJobsNumber(); + + /** + * Gets number of currently {@code 'held'} jobs. + * + * @return Number of currently {@code 'held'} jobs. + */ + @IgniteMXBeanDescription("Number of held jobs.") + public int getCurrentHeldJobsNumber(); + + /** + * Gets number of jobs that can be executed in parallel. + * + * @return Number of jobs that can be executed in parallel. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public int getParallelJobsNumber(); + + /** + * Sets number of jobs that can be executed in parallel. + * + * @param num Parallel jobs number. + */ + @IgniteMXBeanDescription("Number of jobs that can be executed in parallel.") + public void setParallelJobsNumber(int num); + + /** + * Maximum number of jobs that are allowed to wait in waiting queue. If number + * of waiting jobs ever exceeds this number, excessive jobs will be rejected. + * + * @return Maximum allowed number of waiting jobs. + */ + @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") + public int getWaitingJobsNumber(); + + /** + * Maximum number of jobs that are allowed to wait in waiting queue. If number + * of waiting jobs ever exceeds this number, excessive jobs will be rejected. + * + * @param num Maximium jobs number. + */ + @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.") + public void setWaitingJobsNumber(int num); + + /** + * Gets key name of task priority attribute. + * + * @return Key name of task priority attribute. + */ + @IgniteMXBeanDescription("Key name of task priority attribute.") + public String getPriorityAttributeKey(); + + /** + * Gets key name of job priority attribute. + * + * @return Key name of job priority attribute. + */ + @IgniteMXBeanDescription("Key name of job priority attribute.") + public String getJobPriorityAttributeKey(); + + /** + * Gets default priority to use if a job does not have priority attribute + * set. + * + * @return Default priority to use if a task does not have priority + * attribute set. + */ + @IgniteMXBeanDescription("Default priority to use if a task does not have priority attribute set.") + public int getDefaultPriority(); + + /** + * Sets default priority to use if a job does not have priority attribute set. + * + * @param priority default priority. + */ + @IgniteMXBeanDescription("Default priority to use if a task does not have priority attribute set.") + public void setDefaultPriority(int priority); + + /** + * Gets value to increment job priority by every time a lower priority job gets + * behind a higher priority job. + * + * @return Value to increment job priority by every time a lower priority job gets + * behind a higher priority job. + */ + @IgniteMXBeanDescription("Value to increment job priority by every time a lower priority job gets behind a higher priority job.") + public int getStarvationIncrement(); + + /** + * Sets value to increment job priority by every time a lower priority job gets + * behind a higher priority job. + * + * @param increment Increment value. + */ + @IgniteMXBeanDescription("Value to increment job priority by every time a lower priority job gets behind a higher priority job.") + public void setStarvationIncrement(int increment); + + /** + * Gets flag indicating whether job starvation prevention is enabled. + * + * @return Flag indicating whether job starvation prevention is enabled. + */ + @IgniteMXBeanDescription("Flag indicating whether job starvation prevention is enabled.") + public boolean isStarvationPreventionEnabled(); + + /** + * Sets flag indicating whether job starvation prevention is enabled. + * + * @param preventStarvation Flag indicating whether job starvation prevention is enabled. + */ + @IgniteMXBeanDescription("Flag indicating whether job starvation prevention is enabled.") + public void setStarvationPreventionEnabled(boolean preventStarvation); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/903e698a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 4e9369a..e81096a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -143,7 +143,7 @@ import static org.apache.ignite.events.IgniteEventType.*; @IgniteSpiMultipleInstancesSupport(true) @IgniteSpiConsistencyChecked(optional = false) public class TcpCommunicationSpi extends IgniteSpiAdapter - implements CommunicationSpi<GridTcpCommunicationMessageAdapter>, TcpCommunicationSpiMBean { + implements CommunicationSpi<GridTcpCommunicationMessageAdapter>, TcpCommunicationSpiMXBean { /** IPC error message. */ public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " + "(switching to TCP, may be slower). For troubleshooting see " + @@ -1476,7 +1476,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter U.quietAndWarn(log, "'TCP_NO_DELAY' for communication is off, which should be used with caution " + "since may produce significant delays with some scenarios."); - registerMBean(gridName, this, TcpCommunicationSpiMBean.class); + registerMXBean(gridName, this, TcpCommunicationSpiMXBean.class); if (shmemSrv != null) { shmemAcceptWorker = new ShmemAcceptWorker(shmemSrv); @@ -1657,7 +1657,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter @Override public void spiStop() throws IgniteSpiException { assert stopping; - unregisterMBean(); + unregisterMXBean(); // Stop TCP server. if (nioSrvr != null)
