incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1235464 - in /incubator/accumulo/trunk: ./ conf/generic_logger.xml src/core/ src/core/src/main/java/org/apache/accumulo/core/conf/Property.java src/server/ src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java
Date Tue, 24 Jan 2012 20:13:23 GMT
Author: kturner
Date: Tue Jan 24 20:13:23 2012
New Revision: 1235464

URL: http://svn.apache.org/viewvc?rev=1235464&view=rev
Log:
ACCUMULO-326 ACCUMULO-336 merged from 1.4

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/conf/generic_logger.xml
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 20:13:23 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1234951
+/incubator/accumulo/branches/1.4:1201902-1235463

Modified: incubator/accumulo/trunk/conf/generic_logger.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/generic_logger.xml?rev=1235464&r1=1235463&r2=1235464&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/generic_logger.xml (original)
+++ incubator/accumulo/trunk/conf/generic_logger.xml Tue Jan 24 20:13:23 2012
@@ -21,7 +21,7 @@
   <!-- Write out everything at the DEBUG level to the debug log -->
   <appender name="A2" class="org.apache.log4j.RollingFileAppender">
      <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.debug.log"/>
-     <param name="MaxFileSize"    value="100MB"/>
+     <param name="MaxFileSize"    value="1000MB"/>
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
@@ -32,7 +32,7 @@
   <!--  Write out INFO and higher to the regular log -->
   <appender name="A3" class="org.apache.log4j.RollingFileAppender">
      <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.log"/>
-     <param name="MaxFileSize"    value="100MB"/>
+     <param name="MaxFileSize"    value="1000MB"/>
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 20:13:23 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1234951
+/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
+/incubator/accumulo/branches/1.4/src/core:1201902-1235463

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1235464&r1=1235463&r2=1235464&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Tue Jan 24 20:13:23 2012
@@ -157,6 +157,8 @@ public enum Property {
       "The directory used to store write-ahead logs on the local filesystem. It is possible
to specify a comma-separated list of directories."),
   LOGGER_PORTSEARCH("logger.port.search", "false", PropertyType.BOOLEAN, "if the port above
is in use, search higher ports until one is available"),
   LOGGER_ARCHIVE("logger.archive", "false", PropertyType.BOOLEAN, "determines if logs are
archived in hdfs"),
+  LOGGER_ARCHIVE_REPLICATION("logger.archive.replication", "0", PropertyType.COUNT,
+      "determines the replication factor for walogs archived in hdfs, set to zero to use
default"),
   LOGGER_MONITOR_FS(
       "logger.monitor.fs",
       "true",

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 20:13:23 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
 /incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1234099
+/incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
+/incubator/accumulo/branches/1.4/src/server:1201902-1235463

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java?rev=1235464&r1=1235463&r2=1235464&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java
Tue Jan 24 20:13:23 2012
@@ -43,6 +43,7 @@ public class LogArchiver {
   private FileSystem dest;
   private String destDir;
   private final boolean archive;
+  private short replication;
   
   static Path archiveName(String fullPath) {
     if (isArchive(fullPath))
@@ -82,7 +83,8 @@ public class LogArchiver {
         dest.delete(new Path(destDir, name + ".gz_tmp"), false);
         
         FSDataInputStream in = src.open(srcPath);
-        GZIPOutputStream out = new GZIPOutputStream(dest.create(new Path(destDir, name +
".gz_tmp"), false));
+        GZIPOutputStream out = new GZIPOutputStream(dest.create(new Path(destDir, name +
".gz_tmp"), false, dest.getConf().getInt("io.file.buffer.size", 4096),
+            replication == 0 ? dest.getDefaultReplication() : replication, dest.getDefaultBlockSize()));
         
         byte buf[] = new byte[1 << 20];
         int numRead;
@@ -112,6 +114,7 @@ public class LogArchiver {
     this.threadPool = Executors.newSingleThreadExecutor();
     this.destDir = conf.get(Property.INSTANCE_DFS_DIR) + "/walogArchive";
     this.archive = archive;
+    this.replication = (short) conf.getCount(Property.LOGGER_ARCHIVE_REPLICATION);
     dest.mkdirs(new Path(destDir));
     
     if (archive) {



Mime
View raw message