You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2015/07/21 08:23:17 UTC
incubator-atlas git commit: ATLAS-46 Different data directory with
restart (shwethags)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 97219f6ae -> 414816720
ATLAS-46 Different data directory with restart (shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/41481672
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/41481672
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/41481672
Branch: refs/heads/master
Commit: 414816720e1284b0fd2434c78b1c1e89b5b5fb82
Parents: 97219f6
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Jul 21 11:53:11 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Jul 21 11:53:11 2015 +0530
----------------------------------------------------------------------
InstallationSteps.txt | 116 -----------------------
docs/src/site/twiki/InstallationSteps.twiki | 2 +-
release-log.txt | 1 +
src/bin/atlas_start.py | 4 +
src/test/python/scripts/TestMetadata.py | 4 +-
5 files changed, 8 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/41481672/InstallationSteps.txt
----------------------------------------------------------------------
diff --git a/InstallationSteps.txt b/InstallationSteps.txt
deleted file mode 100755
index 23c416d..0000000
--- a/InstallationSteps.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.
-
-A. Building & Installing Atlas
-=================================
-
-0. Prerequisites
-------------------
-
-You would need the following installed:
-
-* JDK 1.7
-* Maven 3.x
-
-
-1. Building Atlas
---------------------
-
-Building Atlas from the source repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* git clone https://git-wip-us.apache.org/repos/asf/incubator-atlas.git atlas
-* cd atlas
-* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install
-
-
-2. Deploying Atlas
----------------------
-
-Once the build successfully completes, artifacts can be packaged for deployment.
-
-* mvn clean verify assembly:assembly -DskipTests
-
-Tar can be found in atlas/target/apache-atlas-${project.version}-bin.tar.gz
-
-Tar is structured as follows
-
-|- bin
- |- atlas_start.py
- |- atlas_stop.py
- |- atlas_config.py
- |- quick_start.py
- |- cputil.py
-|- conf
- |- application.properties
- |- client.properties
- |- atlas-env.sh
- |- log4j.xml
-|- docs
-|- server
- |- webapp
- |- atlas.war
-|- README
-|- NOTICE.txt
-|- LICENSE.txt
-|- DISCLAIMER.txt
-|- CHANGES.txt
-
-3. Installing & running Atlas
---------------------------------
-
-a. Installing Atlas
-~~~~~~~~~~~~~~~~~~~~~~
-
-* tar -xzvf apache-atlas-${project.version}-bin.tar.gz
-* cd atlas-${project.version}
-
-b. Starting Atlas Server
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* bin/atlas-start.sh
-
-c. Using Atlas
-~~~~~~~~~~~~~~~
-
-* Verify if the server is up and running
- curl -v http://localhost:21000/api/atlas/admin/version
- {"Version":"v0.1"}
-
-* List the types in the repository
- curl -v http://localhost:21000/api/atlas/types
- {"list":["biginteger","short","byte","int","string","bigdecimal","boolean","date","double","long","float"],"requestId":"902580786@qtp-1479771328-0"}
-
-* List the instances for a given type
- curl -v http://localhost:21000/api/atlas/entities?type=hive_table
- {"requestId":"788558007@qtp-44808654-5","list":["cb9b5513-c672-42cb-8477-b8f3e537a162","ec985719-a794-4c98-b98f-0509bd23aac0","48998f81-f1d3-45a2-989a-223af5c1ed6e","a54b386e-c759-4651-8779-a099294244c4"]}
-
- curl -v http://localhost:21000/api/atlas/entities/list/hive_db
-
-* Search for entities (instances) in the repository
- curl -v http://localhost:21000/api/atlas/discovery/search/dsl?query="from hive_table"
-
-
-d. Using Atlas Dashboard
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Navigate to http(s)://$host:$port/
-Port by default is 21000
-
-e. Stopping Atlas Server
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* bin/atlas-stop.sh
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/41481672/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 680ffb3..a75498f 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -130,7 +130,7 @@ with multiple atlas upgrades), set environment variable METADATA_CONF to the pat
* List the types in the repository
curl -v http://localhost:21000/api/atlas/types
- {"list":["biginteger","short","byte","int","string","bigdecimal","boolean","date","double","long","float"],"requestId":"902580786@qtp-1479771328-0"}
+ {"results":["Process","Infrastructure","DataSet"],"count":3,"requestId":"1867493731@qtp-262860041-0 - 82d43a27-7c34-4573-85d1-a01525705091"}
* List the instances for a given type
curl -v http://localhost:21000/api/atlas/entities?type=hive_table
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/41481672/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 5cf41a4..0cc6540 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
ALL CHANGES:
+ATLAS-46 Different data directory with restart (shwethags)
ATLAS-81 atlas debian packaing fails in maven build (vijay_k via shwethags)
ATLAS-36 Need separate persisted properties for HTTP and HTTPS ports (jmaron)
ATLAS-21 quick_start script run throws an exception (jmaron)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/41481672/src/bin/atlas_start.py
----------------------------------------------------------------------
diff --git a/src/bin/atlas_start.py b/src/bin/atlas_start.py
index 66e8735..0ad188c 100755
--- a/src/bin/atlas_start.py
+++ b/src/bin/atlas_start.py
@@ -24,6 +24,7 @@ import atlas_config as mc
METADATA_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=application.log"
METADATA_COMMAND_OPTS="-Datlas.home=%s"
METADATA_CONFIG_OPTS="-Datlas.conf=%s"
+ATLAS_USER_DIR="-Duser.dir=%s"
DEFAULT_JVM_OPTS="-Xmx1024m"
def main():
@@ -39,6 +40,9 @@ def main():
cmd_opts = (METADATA_COMMAND_OPTS % metadata_home)
jvm_opts_list.extend(cmd_opts.split())
+ user_dir = (ATLAS_USER_DIR % metadata_home)
+ jvm_opts_list.extend(user_dir.split())
+
config_opts = (METADATA_CONFIG_OPTS % confdir)
jvm_opts_list.extend(config_opts.split())
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/41481672/src/test/python/scripts/TestMetadata.py
----------------------------------------------------------------------
diff --git a/src/test/python/scripts/TestMetadata.py b/src/test/python/scripts/TestMetadata.py
index 0efe96a..d4b0457 100644
--- a/src/test/python/scripts/TestMetadata.py
+++ b/src/test/python/scripts/TestMetadata.py
@@ -50,13 +50,13 @@ class TestMetadata(unittest.TestCase):
'org.apache.atlas.Main',
['-app', 'metadata_home/server/webapp/atlas'],
'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib\\*:metadata_home/libext\\*',
- ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
+ ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Duser.dir=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
else:
java_mock.assert_called_with(
'org.apache.atlas.Main',
['-app', 'metadata_home/server/webapp/atlas'],
'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib/*:metadata_home/libext/*',
- ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
+ ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Duser.dir=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs')
pass