[Bigdata-commit] SF.net SVN: bigdata:[8455] branches/BIGDATA_RELEASE_1_3_0/src/resources

[<tho...@us...>]

Revision: 8455
          http://sourceforge.net/p/bigdata/code/8455
Author:   thompsonbry
Date:     2014-06-09 19:30:26 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Added an HALOG_DIR and a SNAPSHOT_DIR to allow these things to be set independently of the DATA_DIR (which is where the journal lives).

Updated the wiki page at http://wiki.bigdata.com/wiki/index.php/HAJournalServer#Durable_Data to declare these new variables and document others.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config
    branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/default/bigdataHA

Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config	2014-06-09 17:42:45 UTC (rev 8454)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config	2014-06-09 19:30:26 UTC (rev 8455)
@@ -89,10 +89,12 @@
    private static dataDir = new File(ConfigMath.getProperty("DATA_DIR",""+serviceDir));
 
    // HA log directory.
-   private static haLogDir = new File(serviceDir,"HALog");
+   private static haLogDir = new File(ConfigMath.getProperty("HALOG_DIR",""+serviceDir+File.separator+"HALog"));
+   //private static haLogDir = new File(serviceDir,"HALog");
    
    // Snapshot directory.
-   private static snapshotDir = new File(serviceDir,"snapshot");
+   private static snapshot = new File(ConfigMath.getProperty("SNAPSHOT_DIR",""+serviceDir+File.separator+"snapshot"));
+   //private static snapshotDir = new File(serviceDir,"snapshot");
 
    /* Snapshot policy.  Choose one.
     *
@@ -332,7 +334,7 @@
    
       new NV(Options.BUFFER_MODE,""+BufferMode.DiskRW),
 
-      new NV(Options.WRITE_CACHE_BUFFER_COUNT,"2000"),
+      new NV(Options.WRITE_CACHE_BUFFER_COUNT,ConfigMath.getProperty("WRITE_CACHE_BUFFER_COUNT","2000")),
 
       new NV(IndexMetadata.Options.WRITE_RETENTION_QUEUE_CAPACITY,"4000"),
 

Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/default/bigdataHA
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/default/bigdataHA	2014-06-09 17:42:45 UTC (rev 8454)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/default/bigdataHA	2014-06-09 19:30:26 UTC (rev 8455)
@@ -55,6 +55,10 @@
 #export JETTY_PORT=8080
 #export JETTY_XML=var/jetty/WEB-INF/jetty.xml
 #export JETTY_RESOURCE_BASE=var/jetty
+#export WRITE_CACHE_BUFFER_COUNT=2000
+#export DATA_DIR=
+#export HALOG_DIR=
+#export SNAPSHOT_DIR=
 #export COLLECT_QUEUE_STATISTICS=
 #export COLLECT_PLATFORM_STATISTICS=
 #export GANGLIA_REPORT=

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.