svn commit: r1500635 - in /hama/trunk: conf/hama-default.xml core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java

[edwardyoon]

Author: edwardyoon
Date: Mon Jul  8 09:45:08 2013
New Revision: 1500635

URL: http://svn.apache.org/r1500635
Log:
HAMA-775: Disable compression option in hama-default.xml

Modified:
    hama/trunk/conf/hama-default.xml
    
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java

Modified: hama/trunk/conf/hama-default.xml
URL: 
http://svn.apache.org/viewvc/hama/trunk/conf/hama-default.xml?rev=1500635&r1=1500634&r2=1500635&view=diff
==============================================================================
--- hama/trunk/conf/hama-default.xml (original)
+++ hama/trunk/conf/hama-default.xml Mon Jul  8 09:45:08 2013
@@ -218,14 +218,15 @@
     <value>org.apache.hama.bsp.message.HadoopMessageManagerImpl</value>
   </property>
 
+  <!-- The message compression is not recommended for a large production 
environment -->
   <property>
     <name>hama.messenger.compression.class</name>
-    <value>org.apache.hama.bsp.message.compress.SnappyCompressor</value>
-    <description>The message compression algorithm to choose.</description>
+    <value></value>
+    <description>The message compression algorithm to choose. Default is 
null.</description>
   </property>
   <property>
     <name>hama.messenger.compression.threshold</name>
-    <value>1048576</value>
+    <value></value>
     <description>The Compressor threshold sets the level at which compression 
begins.</description>
   </property>
   

Modified: 
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java?rev=1500635&r1=1500634&r2=1500635&view=diff
==============================================================================
--- 
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
 (original)
+++ 
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
 Mon Jul  8 09:45:08 2013
@@ -104,6 +104,7 @@ public final class HadoopMessageManagerI
       if (compressor != null
           && (bundle.getApproximateSize() > conf.getLong(
               "hama.messenger.compression.threshold", 1048576))) {
+        
         BSPCompressedBundle compMsgBundle = compressor.compressBundle(bundle);
         bspPeerConnection.put(compMsgBundle);
         peer.incrementCounter(BSPPeerImpl.PeerCounter.COMPRESSED_MESSAGES, 1L);