date:20220528

[accumulo] branch main updated: Allow overriding default env without editing conf (#2746)

2022-05-28 Thread ctubbsii

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new fa21795f9e Allow overriding default env without editing conf (#2746)
fa21795f9e is described below

commit fa21795f9e7d7ca2da4a24b62f7fc69af9775de1
Author: Christopher Tubbs 
AuthorDate: Sat May 28 16:34:57 2022 -0400

Allow overriding default env without editing conf (#2746)

Update the default conf/accumulo-env.sh script to support overriding
some of the default java options it sets by placing user-provided
options specified by the `ACCUMULO_JAVA_OPTS` environment variable after
any options set in the script (because Java will likely take the last
value set on the command-line).

This fixes #2744
---
 assemble/conf/accumulo-env.sh | 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/assemble/conf/accumulo-env.sh b/assemble/conf/accumulo-env.sh
index 7286d05a8b..46109c9eea 100644
--- a/assemble/conf/accumulo-env.sh
+++ b/assemble/conf/accumulo-env.sh
@@ -73,11 +73,13 @@ export CLASSPATH
 
 ## JVM options set for all processes. Extra options can be passed in by 
setting ACCUMULO_JAVA_OPTS to an array of options.
 read -r -a accumulo_initial_opts < <(echo "$ACCUMULO_JAVA_OPTS")
-JAVA_OPTS=("${accumulo_initial_opts[@]}"
+JAVA_OPTS=(
   '-XX:OnOutOfMemoryError=kill -9 %p'
   '-XX:-OmitStackTraceInFastThrow'
   '-Djava.net.preferIPv4Stack=true'
-  "-Daccumulo.native.lib.path=${lib}/native")
+  "-Daccumulo.native.lib.path=${lib}/native"
+  "${accumulo_initial_opts[@]}"
+)
 
 ## Make sure Accumulo native libraries are built since they are enabled by 
default
 # bin is set by calling script that sources this env file
@@ -88,35 +90,35 @@ JAVA_OPTS=("${accumulo_initial_opts[@]}"
 # cmd is set by calling script that sources this env file
 #shellcheck disable=SC2154
 case "$cmd" in
-  manager | master) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx512m' '-Xms512m') ;;
-  monitor) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx256m' '-Xms256m') ;;
-  gc) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx256m' '-Xms256m') ;;
-  tserver) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx768m' '-Xms768m') ;;
-  compaction-coordinator) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx512m' '-Xms512m') 
;;
-  compactor) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx256m' '-Xms256m') ;;
-  *) JAVA_OPTS=("${JAVA_OPTS[@]}" '-Xmx256m' '-Xms64m') ;;
+  manager | master) JAVA_OPTS=('-Xmx512m' '-Xms512m' "${JAVA_OPTS[@]}") ;;
+  monitor) JAVA_OPTS=('-Xmx256m' '-Xms256m' "${JAVA_OPTS[@]}") ;;
+  gc) JAVA_OPTS=('-Xmx256m' '-Xms256m' "${JAVA_OPTS[@]}") ;;
+  tserver) JAVA_OPTS=('-Xmx768m' '-Xms768m' "${JAVA_OPTS[@]}") ;;
+  compaction-coordinator) JAVA_OPTS=('-Xmx512m' '-Xms512m' "${JAVA_OPTS[@]}") 
;;
+  compactor) JAVA_OPTS=('-Xmx256m' '-Xms256m' "${JAVA_OPTS[@]}") ;;
+  *) JAVA_OPTS=('-Xmx256m' '-Xms64m' "${JAVA_OPTS[@]}") ;;
 esac
 
 ## JVM options set for logging. Review log4j2.properties file to see how they 
are used.
-JAVA_OPTS=("${JAVA_OPTS[@]}"
-  "-Daccumulo.log.dir=${ACCUMULO_LOG_DIR}"
+JAVA_OPTS=("-Daccumulo.log.dir=${ACCUMULO_LOG_DIR}"
   "-Daccumulo.application=${cmd}${ACCUMULO_SERVICE_INSTANCE}_$(hostname)"
   "-Daccumulo.metrics.service.instance=${ACCUMULO_SERVICE_INSTANCE}"
   
"-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
   "-Dotel.service.name=${cmd}${ACCUMULO_SERVICE_INSTANCE}"
+  "${JAVA_OPTS[@]}"
 )
 
 ## Optionally setup OpenTelemetry SDK AutoConfigure
 ## See 
https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/autoconfigure
-#JAVA_OPTS=("${JAVA_OPTS[@]}"  "-Dotel.traces.exporter=jaeger")
+#JAVA_OPTS=('-Dotel.traces.exporter=jaeger' "${JAVA_OPTS[@]}")
 
 ## Optionally setup OpenTelemetry Java Agent
 ## See https://github.com/open-telemetry/opentelemetry-java-instrumentation 
for more options
-#JAVA_OPTS=("${JAVA_OPTS[@]}"  
"-javaagent:path/to/opentelemetry-javaagent-all.jar")
+#JAVA_OPTS=('-javaagent:path/to/opentelemetry-javaagent-all.jar' 
"${JAVA_OPTS[@]}")
 
 case "$cmd" in
   monitor | gc | manager | master | tserver | compaction-coordinator | 
compactor)
-JAVA_OPTS=("${JAVA_OPTS[@]}" 
"-Dlog4j.configurationFile=log4j2-service.properties")
+JAVA_OPTS=('-Dlog4j.configurationFile=log4j2-service.properties' 
"${JAVA_OPTS[@]}")
 ;;
   *)
 # let log4j use its default behavior (log4j2.properties, etc.)

[accumulo-website] branch main updated: update ist definition, add kitswas to contributors' (#320)

2022-05-28 Thread edcoleman

This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/main by this push:
 new c56d946c update ist definition, add kitswas to contributors' (#320)
c56d946c is described below

commit c56d946c4162153858d7cf29c057f9b6b20faa6f
Author: EdColeman 
AuthorDate: Sat May 28 15:05:35 2022 +

update ist definition, add kitswas to contributors' (#320)

- Clarify IST for Ireland / India timezone abbrv. using IST-Ireland and 
IST-India for links
---
 pages/people.md | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/people.md b/pages/people.md
index b1d06c19..1b4e7004 100644
--- a/pages/people.md
+++ b/pages/people.md
@@ -71,14 +71,14 @@ GitHub also has a [contributor list][github-contributors] 
based on commits.
 
|-|---|---|
 | Aaron Glahe | [Data Tactics][DATATACT]   
   | [ET][ET]  |
 | Aishwarya Thangappa | [Microsoft][MICROSOFT] 
   | [PT][PT]  |
-| Akshit Mangotra |
   | [IST][IST]|
+| Akshit Mangotra |
   | [IST][IST-India]  |
 | Al Krinker  |
   | [ET][ET]  |
 | Alex Moundalexis| [Cloudera][CLOUDERA]   
   | [ET][ET]  |
 | Ali Mustafa | [FAST-NU][FAST-NU] 
   | [PKT][PKT]|
-| Amisha Sahu |
   | [IST][IST]|
+| Amisha Sahu |
   | [IST][IST-India]  |
 | Andrew George Wells | [ClearEdgeIT][CLEAREDGE]   
   | [ET][ET]  |
 | Arshak Navruzyan| [Argyle Data][ARGYLE]  
   |   |
-| Ben Kelly   | [Microsoft][MICROSOFT] 
   | [GMT][GMT]/[IST][IST] |
+| Ben Kelly   | [Microsoft][MICROSOFT] 
   | [GMT][GMT]/[IST][IST-Ireland] |
 | Ben Manes   |
   | [PT][PT]  |
 | Benjamin Fach   |
   |   |
 | Bob Thorman | [ATT][ATT]
   |   |
@@ -127,7 +127,7 @@ GitHub also has a [contributor list][github-contributors] 
based on commits.
 | Jonathan Park   | [sqrrl][SQRRL] 
   | [ET][ET]  |
 | Joseph Koshakow |
   | [ET][ET]  |
 | Josselin Chevalay   |
   | [CEST][CEST]  |
-| Kartik Sethi|
   | [IST](https://www.timeanddate.com/worldclock/india/new-delhi)  
  |
+| Kartik Sethi|
   | [IST][IST-India]|
 | Kenneth McFarland   |
   | [PT][PT]  |
 | Kevin Faro  | [Tetra Concepts LLC][TETRA]
   | [ET][ET]  |
 | Kyle Van Gilson |
   |   |
@@ -166,9 +166,10 @@ GitHub also has a [contributor list][github-contributors] 
based on commits.
 | Scott Kuehn |
   |   |
 | Seth Falco  | [Elypia][ELYPIA]   
   | [GMT][GMT]/[BST][BST] |
 | Shawn Walker|
   |   |
-| Shivakumar Gangamath|
   | [IST][IST]|
+| Shivakumar Gangamath|
   | [IST][IST-India]  |
 | Steve Loughran  | [Hortonworks][HORTONWORKS] 
   | [GMT][GMT]/[BST][BST] |
 | Supun Kamburugamuva |
   |   |
+| Swastik Pal

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2022-05-28 Thread git-site-role

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new c6d7714d Automatic Site Publish by Buildbot
c6d7714d is described below

commit c6d7714d6a5699638557b6c193494a9d8e34016a
Author: buildbot 
AuthorDate: Sat May 28 15:05:55 2022 +

Automatic Site Publish by Buildbot
---
 output/feed.xml  |  4 ++--
 output/people/index.html | 13 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/output/feed.xml b/output/feed.xml
index 656a803c..8652c881 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Fri, 27 May 2022 13:02:17 +
-Fri, 27 May 2022 13:02:17 +
+Sat, 28 May 2022 15:05:48 +
+Sat, 28 May 2022 15:05:48 +
 Jekyll v4.2.0
 
 
diff --git a/output/people/index.html b/output/people/index.html
index 18e4505e..5980c336 100644
--- a/output/people/index.html
+++ b/output/people/index.html
@@ -433,7 +433,7 @@ $(function() {
 
   Akshit Mangotra
    
-  https://www.timeanddate.com/time/zones/ist-ireland;>IST
+  https://www.timeanddate.com/time/zones/ist;>IST
 
 
   Al Krinker
@@ -453,7 +453,7 @@ $(function() {
 
   Amisha Sahu
    
-  https://www.timeanddate.com/time/zones/ist-ireland;>IST
+  https://www.timeanddate.com/time/zones/ist;>IST
 
 
   Andrew George Wells
@@ -713,7 +713,7 @@ $(function() {
 
   Kartik Sethi
    
-  https://www.timeanddate.com/worldclock/india/new-delhi;>IST
+  https://www.timeanddate.com/time/zones/ist;>IST
 
 
   Kenneth McFarland
@@ -908,7 +908,7 @@ $(function() {
 
   Shivakumar Gangamath
    
-  https://www.timeanddate.com/time/zones/ist-ireland;>IST
+  https://www.timeanddate.com/time/zones/ist;>IST
 
 
   Steve Loughran
@@ -920,6 +920,11 @@ $(function() {
    
    
 
+
+  Swastik Pal
+   
+  https://www.timeanddate.com/time/zones/ist;>IST
+
 
   Szabolcs Bukros
   https://www.cloudera.com;>Cloudera

[accumulo] branch main updated: Allow overriding default env without editing conf (#2746)

[accumulo-website] branch main updated: update ist definition, add kitswas to contributors' (#320)

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

3 matches

Site Navigation

Mail list logo

Footer information