You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2016/11/19 09:48:17 UTC
[1/5] tinkerpop git commit: build faster with in-memory fs make
giraph wait less
Repository: tinkerpop
Updated Branches:
refs/heads/master 169922cf9 -> 5d67b9fda
build faster with in-memory fs
make giraph wait less
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a39c2fa2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a39c2fa2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a39c2fa2
Branch: refs/heads/master
Commit: a39c2fa23989bd9874205a4970c7647020eb0c7e
Parents: 3441f3f
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Nov 17 17:01:47 2016 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Thu Nov 17 17:01:47 2016 -0500
----------------------------------------------------------------------
docker/scripts/build.sh | 7 +++++++
giraph-gremlin/src/test/resources/giraph-site.xml | 12 ++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a39c2fa2/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 2ee4dff..47da2b8 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -56,6 +56,13 @@ TINKERPOP_BUILD_OPTIONS=""
[ -z "${INCLUDE_NEO4J}" ] || TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -DincludeNeo4j"
[ -z "${BUILD_JAVA_DOCS}" ] && TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -Dmaven.javadoc.skip=true"
+# If the tmpfs (in-memory filesystem exists, use it)
+if [ -d "/usr/src/tinkermem" ]; then
+ echo Copying source to in-memory tmpfs
+ rsync -a . /usr/src/tinkermem
+ cd /usr/src/tinkermem
+fi
+
mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a39c2fa2/giraph-gremlin/src/test/resources/giraph-site.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/test/resources/giraph-site.xml b/giraph-gremlin/src/test/resources/giraph-site.xml
new file mode 100644
index 0000000..9862296
--- /dev/null
+++ b/giraph-gremlin/src/test/resources/giraph-site.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<configuration>
+ <property>
+ <name>giraph.zkServerlistPollMsecs</name>
+ <value>500</value>
+ </property>
+ <property>
+ <name>giraph.logLevel</name>
+ <value>info</value>
+ </property>
+</configuration>
[4/5] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by rd...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7bb77c6c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7bb77c6c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7bb77c6c
Branch: refs/heads/master
Commit: 7bb77c6c2bf2eb3c371c990eb8d6709e63c42da2
Parents: 35364c8 1e80537
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Nov 19 04:47:22 2016 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Nov 19 04:47:22 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docker/build.sh | 2 +-
docker/scripts/build.sh | 7 +++++++
.../developer/development-environment.asciidoc | 18 +++++++++++++++++-
giraph-gremlin/src/test/resources/giraph-site.xml | 12 ++++++++++++
5 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7bb77c6c/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7bb77c6c/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
[2/5] tinkerpop git commit: Change env var DOCKER_OPTS
(TINKERPOP-1556) to TINKERPOP_DOCKER_OPTS
Posted by rd...@apache.org.
Change env var DOCKER_OPTS (TINKERPOP-1556) to TINKERPOP_DOCKER_OPTS
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c430536
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c430536
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c430536
Branch: refs/heads/master
Commit: 5c430536bcf5f782d06b38013ff84a714e97d6e8
Parents: a39c2fa
Author: Robert Dale <ro...@gmail.com>
Authored: Fri Nov 18 11:30:50 2016 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Nov 18 11:30:50 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docker/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c430536/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 10e4121..fa67c56 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,7 +31,7 @@ TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fully shutdown metrics services in Gremlin Server on shutdown.
* Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc.
* Minor fixes to various test feature requirements in `gremlin-test`.
-* Allow developers to pass options to `docker run` with DOCKER_OPTS environment variable
+* Allow developers to pass options to `docker run` with TINKERPOP_DOCKER_OPTS environment variable
Improvements
^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c430536/docker/build.sh
----------------------------------------------------------------------
diff --git a/docker/build.sh b/docker/build.sh
index c314e5e..a102f83 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -47,6 +47,6 @@ CMD ["sh", "-c", "docker/scripts/build.sh $@"]
EOF
docker build -t tinkerpop:${BUILD_TAG} .
-docker run ${DOCKER_OPTS} --rm -ti tinkerpop:${BUILD_TAG}
+docker run ${TINKERPOP_DOCKER_OPTS} --rm -ti tinkerpop:${BUILD_TAG}
popd > /dev/null
[3/5] tinkerpop git commit: added doc
Posted by rd...@apache.org.
added doc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e80537b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e80537b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e80537b
Branch: refs/heads/master
Commit: 1e80537bc0d25a847f3efda36ef23c086ac9b59f
Parents: 5c43053
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Nov 19 04:10:04 2016 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Nov 19 04:10:04 2016 -0500
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e80537b/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 2369133..f7ef0b7 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -56,7 +56,7 @@ Docker Integration
------------------
TinkerPop provides a shell script, that can start several build tasks within a Docker container. The
-required Docker images will be built automatically if they don't exist yet. Thus the first invokation
+required Docker images will be built automatically if they don't exist yet. Thus the first invocation
of the Docker script is expected to take some time.
The script can be found under `PROJECT_HOME/docker/build.sh`. The following tasks are currently
@@ -70,11 +70,27 @@ supported:
A list of command line options is provided by `docker/build.sh --help`. The container will install,
configure and start all required dependencies, such as Hadoop.
+Options can be passed to Docker by setting the `TINKERPOP_DOCKER_OPTS` environment variable. A speed boost can
+be gained at the expense of memory by using tmpfs and the special directory `/usr/src/tinkermem`.
+
+[source,bash]
+.Build in-memory
+----
+TINKERPOP_DOCKER_OPTS="--tmpfs /usr/src/tinkermem:exec,mode=0755,rw,noatime,size=2000m"
+----
+
+[source,bash]
+.Disable IPv6 for Hadoop
+----
+TINKERPOP_DOCKER_OPTS="--sysctl net.ipv6.conf.all.disable_ipv6=1 --sysctl net.ipv6.conf.default.disable_ipv6=1"
+----
+
If the container is used to generate the user docs, it will start a web server and show the URL that
is used to host the HTML docs.
After finishing all tasks, the script will immediately destroy the container.
+
IDE Setup with Intellij
-----------------------
[5/5] tinkerpop git commit: Merge branch 'tp32'
Posted by rd...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d67b9fd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d67b9fd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d67b9fd
Branch: refs/heads/master
Commit: 5d67b9fda392382c9745c582b499f5b16a7127ca
Parents: 169922c 7bb77c6
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Nov 19 04:47:37 2016 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Nov 19 04:47:37 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docker/build.sh | 2 +-
docker/scripts/build.sh | 7 +++++++
.../developer/development-environment.asciidoc | 18 +++++++++++++++++-
giraph-gremlin/src/test/resources/giraph-site.xml | 12 ++++++++++++
5 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d67b9fd/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d67b9fd/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------