You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/28 22:57:09 UTC
[1/7] accumulo git commit: ACCUMULO-3662 Ensure JAVA_HOME is for a JDK
Repository: accumulo
Updated Branches:
refs/heads/1.7 84d614d93 -> f7b093006
refs/heads/master 72d83acd2 -> 32b373067
ACCUMULO-3662 Ensure JAVA_HOME is for a JDK
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd5f184b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd5f184b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cd5f184b
Branch: refs/heads/1.7
Commit: cd5f184b0590aac404fe610d953bfac836b272f8
Parents: b7fcc2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:19:37 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:19:37 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5f184b/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index b9211aa..9ffeefe 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -30,7 +30,10 @@ ifeq ($(shell uname),Linux)
endif
ifeq ($(shell uname),Darwin)
- JAVA_HOME=$(shell /usr/libexec/java_home)
+ JAVA_HOME=$(shell env | grep "^JAVA_HOME=" | cut -d= -f2)
+ ifeq ($(strip $(JAVA_HOME)),)
+ JAVA_HOME=$(shell /usr/libexec/java_home)
+ endif
NATIVE_LIB:= libaccumulo.dylib
ifneq (,$(findstring 10.9,$(shell sw_vers -productVersion)))
MAVERICKFLAGS=-stdlib=libstdc++
@@ -38,6 +41,10 @@ endif
CXXFLAGS=-dynamiclib -undefined dynamic_lookup -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -Ijavah $(USERFLAGS) $(MAVERICK_FLAGS)
endif
+ifeq (,$(wildcard $(JAVA_HOME)/bin/javah))
+$(error "JAVA_HOME does not point to a JDK. Exiting...")
+endif
+
all : $(NATIVE_LIB)
$(NATIVE_LIB) : $(SRCS) $(HDRS)
[4/7] accumulo git commit: ACCUMULO-2871 Fix inconsistent
synchronization
Posted by ct...@apache.org.
ACCUMULO-2871 Fix inconsistent synchronization
* Access currentLogs in Tablet synchronized on Tablet.this, in the same
* way as 1.7 does.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6f7bf39b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f7bf39b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6f7bf39b
Branch: refs/heads/1.7
Commit: 6f7bf39b7a00ab080641958caaefa576ca2fad68
Parents: cd5f184
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:28:53 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:31:46 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/Tablet.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f7bf39b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 6fe2f31..8faa3dc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -3657,12 +3657,10 @@ public class Tablet {
private Set<DfsLogger> currentLogs = new HashSet<DfsLogger>();
- public Set<String> getCurrentLogFiles() {
+ public synchronized Set<String> getCurrentLogFiles() {
Set<String> result = new HashSet<String>();
- synchronized (currentLogs) {
- for (DfsLogger log : currentLogs) {
- result.add(log.getFileName());
- }
+ for (DfsLogger log : currentLogs) {
+ result.add(log.getFileName());
}
return result;
}
[5/7] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7b09300
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7b09300
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7b09300
Branch: refs/heads/master
Commit: f7b0930065e490f4b8fe670fad5a8b706dd4ae3d
Parents: 84d614d 6f7bf39
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:56:13 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:56:13 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7b09300/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
[6/7] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7b09300
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7b09300
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7b09300
Branch: refs/heads/1.7
Commit: f7b0930065e490f4b8fe670fad5a8b706dd4ae3d
Parents: 84d614d 6f7bf39
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:56:13 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:56:13 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7b09300/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
[2/7] accumulo git commit: ACCUMULO-3662 Ensure JAVA_HOME is for a JDK
Posted by ct...@apache.org.
ACCUMULO-3662 Ensure JAVA_HOME is for a JDK
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd5f184b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd5f184b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cd5f184b
Branch: refs/heads/master
Commit: cd5f184b0590aac404fe610d953bfac836b272f8
Parents: b7fcc2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:19:37 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:19:37 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5f184b/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index b9211aa..9ffeefe 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -30,7 +30,10 @@ ifeq ($(shell uname),Linux)
endif
ifeq ($(shell uname),Darwin)
- JAVA_HOME=$(shell /usr/libexec/java_home)
+ JAVA_HOME=$(shell env | grep "^JAVA_HOME=" | cut -d= -f2)
+ ifeq ($(strip $(JAVA_HOME)),)
+ JAVA_HOME=$(shell /usr/libexec/java_home)
+ endif
NATIVE_LIB:= libaccumulo.dylib
ifneq (,$(findstring 10.9,$(shell sw_vers -productVersion)))
MAVERICKFLAGS=-stdlib=libstdc++
@@ -38,6 +41,10 @@ endif
CXXFLAGS=-dynamiclib -undefined dynamic_lookup -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -Ijavah $(USERFLAGS) $(MAVERICK_FLAGS)
endif
+ifeq (,$(wildcard $(JAVA_HOME)/bin/javah))
+$(error "JAVA_HOME does not point to a JDK. Exiting...")
+endif
+
all : $(NATIVE_LIB)
$(NATIVE_LIB) : $(SRCS) $(HDRS)
[7/7] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32b37306
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32b37306
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32b37306
Branch: refs/heads/master
Commit: 32b373067a82f48c398dd9ba422aa4cf44135cfc
Parents: 72d83ac f7b0930
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:56:31 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:56:31 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/7] accumulo git commit: ACCUMULO-2871 Fix inconsistent
synchronization
Posted by ct...@apache.org.
ACCUMULO-2871 Fix inconsistent synchronization
* Access currentLogs in Tablet synchronized on Tablet.this, in the same
* way as 1.7 does.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6f7bf39b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f7bf39b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6f7bf39b
Branch: refs/heads/master
Commit: 6f7bf39b7a00ab080641958caaefa576ca2fad68
Parents: cd5f184
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:28:53 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:31:46 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/Tablet.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f7bf39b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 6fe2f31..8faa3dc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -3657,12 +3657,10 @@ public class Tablet {
private Set<DfsLogger> currentLogs = new HashSet<DfsLogger>();
- public Set<String> getCurrentLogFiles() {
+ public synchronized Set<String> getCurrentLogFiles() {
Set<String> result = new HashSet<String>();
- synchronized (currentLogs) {
- for (DfsLogger log : currentLogs) {
- result.add(log.getFileName());
- }
+ for (DfsLogger log : currentLogs) {
+ result.add(log.getFileName());
}
return result;
}