accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/7] git commit: Merge branch '1.5' into 1.6
Date Sun, 12 Oct 2014 16:56:06 GMT
Merge branch '1.5' into 1.6

Conflicts:
	assemble/conf/examples/vfs-classloader/accumulo-site.xml
	assemble/conf/templates/accumulo-site.xml
	conf/examples/1GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml
	conf/examples/3GB/native-standalone/accumulo-site.xml
	conf/examples/3GB/standalone/accumulo-site.xml
	conf/examples/512MB/native-standalone/accumulo-site.xml
	conf/examples/512MB/standalone/accumulo-site.xml


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

Branch: refs/heads/1.6
Commit: ecd9f7b10ebce1f14f5bbfd36207d066a3d45b99
Parents: 2890530 f816e78
Author: Josh Elser <elserj@apache.org>
Authored: Sun Oct 12 12:55:24 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Oct 12 12:55:24 2014 -0400

----------------------------------------------------------------------
 assemble/conf/examples/vfs-classloader/accumulo-site.xml | 2 ++
 assemble/conf/templates/accumulo-site.xml                | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecd9f7b1/assemble/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --cc assemble/conf/examples/vfs-classloader/accumulo-site.xml
index 2578fc8,0000000..73284bc
mode 100644,000000..100644
--- a/assemble/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/assemble/conf/examples/vfs-classloader/accumulo-site.xml
@@@ -1,175 -1,0 +1,177 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  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.
 +-->
 +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 +
 +<configuration>
 +  <!-- Put your site-specific accumulo configurations here. The available configuration
values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change
the three entries below. -->
 +
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
 +
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used
to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the
first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in
order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old
[oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>80M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>7M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>20M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>50M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>100M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
 +    <value>
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +      <!-- Comment the following for hadoop-1 -->
 +      $HADOOP_PREFIX/share/hadoop/common/.*.jar,
 +      $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
 +      $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
 +      $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
 +      $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar,
 +      /usr/lib/hadoop/.*.jar,
 +      /usr/lib/hadoop/lib/.*.jar,
 +      /usr/lib/hadoop-hdfs/.*.jar,
 +      /usr/lib/hadoop-mapreduce/.*.jar,
 +      /usr/lib/hadoop-yarn/.*.jar,
++      /usr/lib/hadoop-yarn/lib/jersey.*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.</description>
 +  </property>
 +
 +  <!-- VFS ClassLoader Settings -->
 +  
 +  <!--
 +  At a minimum the general.vfs.classpath property must be set. After this is set in the
configuration, the bin/bootstrap_hdfs.sh can be
 +  run to move the jars into the required locations. All other properties are optional. This
example demonstrates using hdfs, other
 +  protocols supported by the Apache Commons VFS software can be used but are not demonstrated
here. If the accumulo-site.xml changes
 +  after initial configuration, you will want to copy the file to all of the slave hosts.

 +  -->
 +  <property>
 +    <name>general.vfs.classpaths</name>
 +    <value>hdfs://localhost:8020/accumulo/system-classpath</value>
 +    <description>Configuration for a system level vfs classloader. Accumulo jars can
be configured here and loaded out of HDFS.</description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.cache.dir</name>
 +    <value>/tmp</value>
 +    <description>Directory to use for the vfs cache. The cache will keep a soft reference
to all of the classes loaded in the VM.
 +      This should be on local disk on
 +      each node with sufficient space. It defaults to /tmp and will use a directory with
the
 +      format "accumulo-vfs-cache-" + System.getProperty("user.name",
 +      "nouser")
 +    </description>
 +  </property>
 +
 +  <!--
 +  Properties in this category define a classpath for a named context. These properties start
with the category prefix, followed by a context name.
 +  The value is a comma seperated list of URIs. Supports full regex on filename alone. For
example 
 +  general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar.  You can enable post
delegation for a context, which will load classes from 
 +  the context first instead of the parent first.  Do this by setting general.vfs.context.classpath.<name>.delegation=post,
where <name> 
 +  is your context name.  If delegation is not specified, it defaults to loading from parent
classloader first.
 +  -->
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application1</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar</value>
 +    <description>classpath for the application1 context</description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application1.delegation=post</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar</value>
 +    <description>classpath for the application1 context, but the classloader parent
delegation model is inverted to prefer the jars/classes in this directory
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application2</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar,hdfs://localhost:8020/application2/classpath/*.jar</value>
 +    <description>classpath for the application2 context, includes all of the jars
in app1 context</description>
 +  </property>
 +  
 +  <!--
 +  Once classpath context are configured, tables can be configured in the shell to use them
via the table.classpath.context property.
 +  For example, all of the tables related to application1 would have the context.classpath
property set to 'application1'. 
 +  -->
 +
 +</configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecd9f7b1/assemble/conf/templates/accumulo-site.xml
----------------------------------------------------------------------
diff --cc assemble/conf/templates/accumulo-site.xml
index 08c905b,0000000..4f5fb13
mode 100644,000000..100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@@ -1,132 -1,0 +1,134 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  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.
 +-->
 +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 +
 +<configuration>
 +  <!-- Put your site-specific accumulo configurations here. The available configuration
values along with their defaults are documented in docs/config.html Unless
 +    you are simply testing at your workstation, you will most definitely need to change
the three entries below. -->
 +
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
 +
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used
to store write-ahead logs on the local
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the
first time it will copy any 1.4
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in
order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old
[oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>${memMapMax}</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.native.enabled</name>
 +    <value>${nativeEnabled}</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>${cacheDataSize}</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>${cacheIndexSize}</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>${sortBufferSize}</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>${waLogMaxSize}</value>
 +  </property>
 +${mvnProjBaseDir}
 +  <property>
 +    <name>general.classpaths</name>
 +
 +    <value>
 +      <!-- Accumulo requirements -->
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      <!-- End Accumulo requirements -->
 +
 +      <!-- ZooKeeper requirements -->
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      <!-- End ZooKeeper requirements -->
 +
 +      <!-- Common Hadoop requirements -->
 +      $HADOOP_CONF_DIR,
 +      <!-- End Common Hadoop requirements -->
 +
 +      <!-- Hadoop 2 requirements -->
 +      $HADOOP_PREFIX/share/hadoop/common/[^.].*.jar,
 +      $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
 +      $HADOOP_PREFIX/share/hadoop/hdfs/[^.].*.jar,
 +      $HADOOP_PREFIX/share/hadoop/mapreduce/[^.].*.jar,
 +      $HADOOP_PREFIX/share/hadoop/yarn/[^.].*.jar,
++      $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar,
 +      /usr/lib/hadoop/[^.].*.jar,
 +      /usr/lib/hadoop/lib/[^.].*.jar,
 +      /usr/lib/hadoop-hdfs/[^.].*.jar,
 +      /usr/lib/hadoop-mapreduce/[^.].*.jar,
 +      /usr/lib/hadoop-yarn/[^.].*.jar,
++      /usr/lib/hadoop-yarn/lib/jersey.*.jar,
 +      <!-- End Hadoop 2 requirements -->
 +
 +      <!-- Hadoop 1 requirements -->
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar,
 +      <!-- End Hadoop 1 requirements -->
 +
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.</description>
 +  </property>
 +</configuration>


Mime
View raw message