ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-11314. Enable Accumulo native maps by default - an some cleanup (billie via smohanty)
Date Thu, 21 May 2015 23:26:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk cf2283b88 -> 16683c435


AMBARI-11314. Enable Accumulo native maps by default - an some cleanup (billie via smohanty)


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

Branch: refs/heads/trunk
Commit: 16683c43573106fedf2c51538c75370c194f0352
Parents: cf2283b
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Thu May 21 16:26:01 2015 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Thu May 21 16:26:01 2015 -0700

----------------------------------------------------------------------
 .../1.6.1.2.2.0/configuration/accumulo-env.xml  |   2 +-
 .../1.6.1.2.2.0/configuration/accumulo-site.xml |  12 +-
 .../1.6.1.2.2.0/package/scripts/accumulo.py     | 120 -------------------
 ambari-web/app/data/HDP2/site_properties.js     |   2 +-
 4 files changed, 8 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/16683c43/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index a650e4d..67da50e 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -73,7 +73,7 @@
   </property>
   <property>
     <name>accumulo_tserver_heapsize</name>
-    <value>1024</value>
+    <value>1536</value>
     <description>Accumulo Tablet Server Heap Size.</description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/16683c43/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
index a2bfddf..622ec5a 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
@@ -42,7 +42,7 @@
 
   <property>
     <name>tserver.memory.maps.max</name>
-    <value>256M</value>
+    <value>1G</value>
     <description>Amount of memory to use for Accumulo's in-memory
       map, where incoming writes are sorted.  If native maps are enabled
       (tserver.memory.maps.native.enabled) this memory is
@@ -52,7 +52,7 @@
 
   <property>
     <name>tserver.memory.maps.native.enabled</name>
-    <value>false</value>
+    <value>true</value>
     <description>Controls whether or not native maps are enabled
       for Accumulo's in-memory map, where incoming writes are
       sorted (see also tserver.memory.maps.max).</description>
@@ -60,26 +60,26 @@
 
   <property>
     <name>tserver.cache.data.size</name>
-    <value>64M</value>
+    <value>128M</value>
     <description>Size of on-heap block cache for data blocks.</description>
   </property>
 
   <property>
     <name>tserver.cache.index.size</name>
-    <value>128M</value>
+    <value>256M</value>
     <description>Size of on-heap block cache for index blocks.</description>
   </property>
 
   <property>
     <name>tserver.sort.buffer.size</name>
-    <value>100M</value>
+    <value>200M</value>
     <description>Amount of memory to use for sorting walogs when
       recovering from tserver failure.</description>
   </property>
 
   <property>
     <name>tserver.walog.max.size</name>
-    <value>512M</value>
+    <value>1G</value>
     <description>Maximum size of each write-ahead log.</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/16683c43/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo.py
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo.py
deleted file mode 100644
index 5e476a5..0000000
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-"""
-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.
-
-"""
-import os
-
-from resource_management import *
-import sys
-
-def accumulo(name=None # 'master' or 'tserver' or 'client'
-              ):
-  import params
-
-  Directory( params.accumulo_conf_dir,
-      owner = params.accumulo_user,
-      recursive = True
-  )
-
-  XmlConfig( "accumulo-site.xml",
-            conf_dir = params.accumulo_conf_dir,
-            configurations = params.config['configurations']['accumulo-site'],
-            configuration_attributes=params.config['configuration_attributes']['accumulo-site'],
-            owner = params.accumulo_user,
-            mode = 0600
-  )
-
-  XmlConfig("hdfs-site.xml",
-            conf_dir=params.hadoop_conf_dir,
-            configurations=params.config['configurations']['hdfs-site'],
-            configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
-            owner=params.hdfs_user,
-    )
-
-  if 'accumulo-policy' in params.config['configurations']:
-    XmlConfig( "accumulo-policy.xml",
-            conf_dir = params.accumulo_conf_dir,
-            configurations = params.config['configurations']['accumulo-policy'],
-            configuration_attributes=params.config['configuration_attributes']['accumulo-policy'],
-            owner = params.accumulo_user,
-    )
-  else:
-    File( format("{params.accumulo_conf_dir}/accumulo-policy.xml"),
-      owner = params.accumulo_user,
-    )
-
-  Directory (params.log_dir,
-    owner = params.accumulo_user,
-    recursive = True
-  )
-
-  if (params.log4j_props != None):
-    File(format("{params.accumulo_conf_dir}/log4j.properties"),
-         mode=0644,
-         owner=params.accumulo_user,
-         content=params.log4j_props
-    )
-  elif (os.path.exists(format("{params.accumulo_conf_dir}/log4j.properties"))):
-    File(format("{params.accumulo_conf_dir}/log4j.properties"),
-      mode=0644,
-      owner=params.accumulo_user
-    )
-
-  if name == "master":
-    params.HdfsDirectory(format("{params.accumulo_hdfs_root_dir}"),
-                         action="create_on_execute",
-                         owner=params.accumulo_user,
-    )
-    params.HdfsDirectory(format("{params.accumulo_hdfs_stage_dir}"),
-                         action="create_on_execute",
-                         owner=params.accumulo_user,
-                         mode=0751
-    )
-    params.HdfsDirectory(None, action="create")
-
-  accumulo_StaticFile("auditLog.xml")
-  accumulo_StaticFile("generic_logger.xml")
-  accumulo_StaticFile("monitor_logger.xml")
-  accumulo_StaticFile("accumulo-metrics.xml")
-
-  accumulo_StaticFile("tracers")
-  accumulo_StaticFile("gc")
-  accumulo_StaticFile("monitor")
-  accumulo_StaticFile('slaves')
-  accumulo_StaticFile('masters')
-
-  accumulo_TemplateConfig('accumulo-env.sh')
-
-def accumulo_TemplateConfig(name,
-                         tag=None
-                         ):
-  import params
-
-  TemplateConfig( format("{params.accumulo_conf_dir}/{name}"),
-      owner = params.accumulo_user,
-      template_tag = tag
-  )
-
-def accumulo_StaticFile(name):
-    import params
-
-    File(format("{params.accumulo_conf_dir}/{name}"),
-      mode=0644,
-      owner=params.accumulo_user,
-      content=StaticFile(name)
-    )

http://git-wip-us.apache.org/repos/asf/ambari/blob/16683c43/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index f9acd73..ba25035 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2163,7 +2163,7 @@ var hdp2properties = [
     "name": "tserver.memory.maps.native.enabled",
     "displayName": "tserver.memory.maps.native.enabled",
     "displayType": "checkbox",
-    "recommendedValue": false,
+    "recommendedValue": true,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "Advanced accumulo-site",


Mime
View raw message