ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [27/37] incubator-ignite git commit: sp-3-p1 minor
Date Wed, 15 Apr 2015 10:16:11 GMT
sp-3-p1 minor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4afde91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4afde91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4afde91

Branch: refs/heads/ignite-738
Commit: f4afde91310825a5ecc54ba1cf44bb2404fd887a
Parents: 88c58e8
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Apr 15 11:04:32 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Apr 15 11:04:32 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/IgniteSystemProperties.java   |  6 -----
 .../communication/tcp/TcpCommunicationSpi.java  | 25 --------------------
 .../tcp/TcpCommunicationSpiMBean.java           |  9 -------
 3 files changed, 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4afde91/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index ca7857c..439ea2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -240,12 +240,6 @@ public final class IgniteSystemProperties {
     public static final String IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT";
 
     /**
-     * System property to manage ratio for communication buffer resize. Buffer size will
either
-     * increase or decrease according to this ratio depending on system behavior. Default
value is {@code 0.8}.
-     */
-    public static final String IGNITE_COMMUNICATION_BUF_RESIZE_RATIO = "IGNITE_COMMUNICATION_BUF_RESIZE_RATIO";
-
-    /**
      * Flag that will force Ignite to fill memory block with some recognisable pattern right
before
      * this memory block is released. This will help to recognize cases when already released
memory is accessed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4afde91/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 1b0294e..c3bfb87 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
@@ -89,7 +89,6 @@ import static org.apache.ignite.events.EventType.*;
  * <li>{@code TCP_NODELAY} socket option for sockets (see {@link #setTcpNoDelay(boolean)})</li>
  * <li>Message queue limit (see {@link #setMessageQueueLimit(int)})</li>
  * <li>Minimum buffered message count (see {@link #setMinimumBufferedMessageCount(int)})</li>
- * <li>Buffer size ratio (see {@link #setBufferSizeRatio(double)})</li>
  * <li>Connect timeout (see {@link #setConnectTimeout(long)})</li>
  * <li>Maximum connect timeout (see {@link #setMaxConnectTimeout(long)})</li>
  * <li>Reconnect attempts count (see {@link #setReconnectCount(int)})</li>
@@ -633,9 +632,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     /** Min buffered message count. */
     private int minBufferedMsgCnt = Integer.getInteger(IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT,
512);
 
-    /** Buffer size ratio. */
-    private double bufSizeRatio = IgniteSystemProperties.getDouble(IGNITE_COMMUNICATION_BUF_RESIZE_RATIO,
0.8);
-
     /** NIO server. */
     private GridNioServer<Message> nioSrvr;
 
@@ -1123,25 +1119,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
         return minBufferedMsgCnt;
     }
 
-    /**
-     * Sets the buffer size ratio for this SPI. As messages are sent,
-     * the buffer size is adjusted using this ratio.
-     * <p>
-     * Defaults to either {@code 0.8} or {@link IgniteSystemProperties#IGNITE_COMMUNICATION_BUF_RESIZE_RATIO}
-     * system property (if specified).
-     *
-     * @param bufSizeRatio Buffer size ratio.
-     */
-    @IgniteSpiConfiguration(optional = true)
-    public void setBufferSizeRatio(double bufSizeRatio) {
-        this.bufSizeRatio = bufSizeRatio;
-    }
-
-    /** {@inheritDoc} */
-    @Override public double getBufferSizeRatio() {
-        return bufSizeRatio;
-    }
-
     /** {@inheritDoc} */
     @Override public void setListener(CommunicationListener<Message> lsnr) {
         this.lsnr = lsnr;
@@ -1205,7 +1182,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
         assertParameter(reconCnt > 0, "reconnectCnt > 0");
         assertParameter(selectorsCnt > 0, "selectorsCnt > 0");
         assertParameter(minBufferedMsgCnt >= 0, "minBufferedMsgCnt >= 0");
-        assertParameter(bufSizeRatio > 0 && bufSizeRatio < 1, "bufSizeRatio
> 0 && bufSizeRatio < 1");
         assertParameter(connTimeout >= 0, "connTimeout >= 0");
         assertParameter(maxConnTimeout >= connTimeout, "maxConnTimeout >= connTimeout");
         assertParameter(sockWriteTimeout >= 0, "sockWriteTimeout >= 0");
@@ -1277,7 +1253,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
             log.debug(configInfo("sockRcvBuf", sockRcvBuf));
             log.debug(configInfo("msgQueueLimit", msgQueueLimit));
             log.debug(configInfo("minBufferedMsgCnt", minBufferedMsgCnt));
-            log.debug(configInfo("bufSizeRatio", bufSizeRatio));
             log.debug(configInfo("connTimeout", connTimeout));
             log.debug(configInfo("maxConnTimeout", maxConnTimeout));
             log.debug(configInfo("reconCnt", reconCnt));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4afde91/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
index 6f3f94d..5c80e6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
@@ -237,15 +237,6 @@ public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean
{
     public int getMinimumBufferedMessageCount();
 
     /**
-     * Gets the buffer size ratio for this SPI. As messages are sent,
-     * the buffer size is adjusted using this ratio.
-     *
-     * @return Buffer size ratio.
-     */
-    @MXBeanDescription("Buffer size ratio.")
-    public double getBufferSizeRatio();
-
-    /**
      * Gets socket write timeout for TCP connections. If message can not be written to
      * socket within this time then connection is closed and reconnect is attempted.
      *


Mime
View raw message