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 2016/03/01 07:50:31 UTC

incubator-atlas git commit: ATLAS-536 Falcon hook loads incorrect configuration when -Datlas.conf is not given when falcon server startup (ayubkhan via shwethags)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master 6a63f7154 -> 92574b574


ATLAS-536 Falcon hook loads incorrect configuration when -Datlas.conf is not given when falcon server startup (ayubkhan via 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/92574b57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/92574b57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/92574b57

Branch: refs/heads/master
Commit: 92574b57484684da3fd62d9e21cf7f3841dc2ff7
Parents: 6a63f71
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Mar 1 12:20:21 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Mar 1 12:20:21 2016 +0530

----------------------------------------------------------------------
 docs/src/site/twiki/Bridge-Falcon.twiki | 5 ++++-
 release-log.txt                         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/92574b57/docs/src/site/twiki/Bridge-Falcon.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Bridge-Falcon.twiki b/docs/src/site/twiki/Bridge-Falcon.twiki
index 98737fb..4f5e676 100644
--- a/docs/src/site/twiki/Bridge-Falcon.twiki
+++ b/docs/src/site/twiki/Bridge-Falcon.twiki
@@ -16,7 +16,10 @@ Falcon supports listeners on falcon entity submission. This is used to add entit
 The hook submits the request to a thread pool executor to avoid blocking the command execution. The thread submits the entities as message to the notification server and atlas server reads these messages and registers the entities.
    * Add 'org.apache.falcon.atlas.service.AtlasService' to application.services in <falcon-conf>/startup.properties
    * Link falcon hook jars in falcon classpath - 'ln -s <atlas-home>/hook/falcon/* <falcon-home>/server/webapp/falcon/WEB-INF/lib/'
-   * Copy <atlas-conf>/atlas-application.properties to the falcon conf directory.
+   * In <falcon_conf>/falcon-env.sh, set an environment variable as follows:
+     <verbatim>
+     export FALCON_SERVER_OPTS="$FALCON_SERVER_OPTS -Datlas.conf=<atlas-conf>"
+     </verbatim>
 
 The following properties in <atlas-conf>/atlas-application.properties control the thread pool and notification details:
    * atlas.hook.falcon.synchronous - boolean, true to run the hook synchronously. default false

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/92574b57/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 8663241..6689143 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-536 Falcon hook loads incorrect configuration when -Datlas.conf is not given when falcon server startup (ayubkhan via shwethags)
 ATLAS-502 UI: Provide the ability to search for tags (anilsg via shwethags)
 ATLAS-364 UI Code standardization (darshankumar89 via shwethags)
 ATLAS_396 Creating an entity with non-existing type results in "Unable to deserialize json" error (guptaneeru via sumasai)