bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject [bigtop] branch master updated: BIGTOP-3135: Remove deprecated giraph-site.xml
Date Wed, 23 Jan 2019 02:24:19 GMT
This is an automated email from the ASF dual-hosted git repository.

junhe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 209642e  BIGTOP-3135: Remove deprecated giraph-site.xml
209642e is described below

commit 209642ef6e9e277bcc4e2c94e79b2cfcb56614d4
Author: Yuqi Gu <yuqi.gu@arm.com>
AuthorDate: Mon Jan 14 16:15:09 2019 +0000

    BIGTOP-3135: Remove deprecated giraph-site.xml
    
    The 'bigtop-packages/src/common/giraph/giraph-site.xml' is deprecated.
    The puppet used its templates giraph-site.xml file for giraph deployment.
    
    Change-Id: Ib0b5d62c3dd69d43919704da5511096dc3e323b5
    Signed-off-by: Yuqi Gu <yuqi.gu@arm.com>
    Signed-off-by: Jun He <junhe@apache.org>
---
 bigtop-packages/src/common/giraph/giraph-site.xml  | 35 ----------------------
 .../src/common/giraph/install_giraph.sh            |  4 +--
 bigtop-packages/src/deb/giraph/rules               |  2 --
 bigtop-packages/src/rpm/giraph/SPECS/giraph.spec   |  3 --
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/bigtop-packages/src/common/giraph/giraph-site.xml b/bigtop-packages/src/common/giraph/giraph-site.xml
deleted file mode 100755
index ec943de..0000000
--- a/bigtop-packages/src/common/giraph/giraph-site.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-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.
--->
-<!-- This configuration is for Giraph-specific configs that should be set across runs
-->
-
-<configuration>
-  <property>
-    <name>giraph.useNetty</name>
-    <value>true</value>
-    <description>Force the use of Netty over Hadoop RPC to avoid issues with different
versions of Hadoop</description>
-  </property>
-
-  <property>
-    <name>giraph.zkList</name>
-    <value>localhost</value>
-    <description>Prefer external Zookeeper over the embedded one</description>
-  </property>
-</configuration>
diff --git a/bigtop-packages/src/common/giraph/install_giraph.sh b/bigtop-packages/src/common/giraph/install_giraph.sh
index 5b2ae12..0cc9d94 100644
--- a/bigtop-packages/src/common/giraph/install_giraph.sh
+++ b/bigtop-packages/src/common/giraph/install_giraph.sh
@@ -144,8 +144,8 @@ done
 install -d -m 0755 $PREFIX/$CONF_DIR
 (cd ${BUILD_DIR}/conf && tar cf - .) | (cd $PREFIX/$CONF_DIR && tar xf -)
 
-unlink $PREFIX/$LIB_DIR/conf || /bin/true
-ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
+rm -rf $PREFIX/$LIB_DIR/conf
+ln -rs $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
 
 # Create version independent symlinks
 for i in accumulo core gora hbase hcatalog hive kibble rexster ; do
diff --git a/bigtop-packages/src/deb/giraph/rules b/bigtop-packages/src/deb/giraph/rules
index 586f732..5e74084 100644
--- a/bigtop-packages/src/deb/giraph/rules
+++ b/bigtop-packages/src/deb/giraph/rules
@@ -35,6 +35,4 @@ override_dh_auto_install:
 	  --conf-dir=/etc/giraph/conf.dist \
           --doc-dir=/usr/share/doc/giraph  \
 	  --prefix=debian/tmp
-	# Workaround for GIRAPH-198
-	cp -f debian/giraph-site.xml debian/tmp/etc/giraph/conf.dist
 
diff --git a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
index 2807e75..f82cb50 100644
--- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
+++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
@@ -57,7 +57,6 @@ License: ASL 2.0
 Source0: %{name}-%{giraph_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_%{name}.sh
-Source3: giraph-site.xml
 #BIGTOP_PATCH_FILES
 Buildarch: noarch
 Requires: zookeeper, hadoop-client, bigtop-utils >= 0.7
@@ -89,8 +88,6 @@ sh %{SOURCE2} \
           --conf-dir=%{conf_giraph}.dist \
           --doc-dir=%{doc_giraph} \
           --prefix=$RPM_BUILD_ROOT
-# Workaround for GIRAPH-198
-%__cp -f %{SOURCE3} $RPM_BUILD_ROOT/etc/giraph/conf.dist
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 


Mime
View raw message