BIGTOP-832. Bump version of Hue to 2.3.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7b2f77dd Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7b2f77dd Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7b2f77dd Branch: refs/heads/master Commit: 7b2f77dd253a5f70545b35dbfb224791bf51b1f2 Parents: 860dff6 Author: Roman Shaposhnik <[email protected]> Authored: Wed Apr 3 09:30:55 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sun Apr 21 20:15:12 2013 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hue/templates/hue.ini | 97 ++++++++++----- bigtop-packages/src/common/hue/do-component-build | 2 - bigtop-packages/src/common/hue/install_hue.sh | 6 - bigtop-packages/src/deb/hue/control | 18 ++-- bigtop-packages/src/deb/hue/hue-app.prerm.tpl | 2 +- bigtop-packages/src/deb/hue/hue-pig.install | 1 + bigtop-packages/src/deb/hue/rules | 5 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 42 ++++--- bigtop.mk | 4 +- 9 files changed, 108 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-deploy/puppet/modules/hue/templates/hue.ini ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini index 3a9d5ad..cf4fe8d 100644 --- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini +++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini @@ -17,12 +17,12 @@ # =================================== # # For complete documentation about the contents of this file, run -# $ <hue_root>/build/env/bin/hue config_help +# $ <hue_root>/build/env/bin/hue config_help # # All .ini files under the current directory are treated equally. Their # contents are merged to form the Hue configuration, which can # can be viewed on the Hue at -# http://<hue_host>:<port>/dump_config +# http://<hue_host>:<port>/dump_config ########################################################################### @@ -31,6 +31,11 @@ [desktop] + send_dbug_messages=1 + + # To show database transactions, set database_logging to 1 + database_logging=0 + # Set this to a random string, the longer the better. # This is used for secure hashing in the session store. secret_key=deaddeafdeaddeafdeaddeafdeaddeafdeaddeafdeaddeafdeaddeaf @@ -106,6 +111,7 @@ # - desktop.auth.backend.PamBackend # - desktop.auth.backend.SpnegoDjangoBackend # - desktop.auth.backend.RemoteUserDjangoBackend + # - desktop.auth.backend.OAuthBackend ## backend=desktop.auth.backend.AllowFirstUserDjangoBackend ## pam_service=login @@ -133,8 +139,13 @@ # URL of the LDAP server ## ldap_url=ldap://auth.mycompany.com - # Path to certificate for authentication over TLS + # A PEM-format file containing certificates for the CA's that + # Hue will trust for authentication over TLS. + # The certificate for the CA that signed the + # LDAP server certificate must be included among these certificates. + # See more here http://www.openldap.org/doc/admin24/tls.html. ## ldap_cert= + ## use_start_tls=true # Distinguished name of the user to bind as -- not necessary if the LDAP server # supports anonymous searches @@ -165,12 +176,9 @@ # Base filter for searching for groups ## group_filter="objectclass=*" - # The group name attribute in the LDAP schema + # The username attribute in the LDAP schema ## group_name_attr=cn - # The attribute of the group object which identifies the members of the group - ## group_member_attr=members - # Configuration options for specifying the Desktop Database. For more info, # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine # ------------------------------------------------------------------------ @@ -221,6 +229,25 @@ <% end %> + # Configuration options for using OAuthBackend login + # ------------------------------------------------------------------------ + [[oauth]] + # The Consumer key of the application + ## consumer_key=XXXXXXXXXXXXXXXXXXXXX + + # The Consumer secret of the application + ## consumer_secret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + # The Request token URL + ## request_token_url=https://api.twitter.com/oauth/request_token + + # The Access token URL + ## access_token_url=https://api.twitter.com/oauth/access_token + + # The Authorize URL + ## authenticate_url=https://api.twitter.com/oauth/authorize + + ########################################################################### # Settings to configure your Hadoop cluster. ########################################################################### @@ -400,6 +427,14 @@ # visible only to the owner and administrators. ## share_saved_queries=true + # The backend to contact for queries/metadata requests + # Choices are 'beeswax' (default), 'hiveserver2'. + ## server_interface=beeswax + + # Time in milliseconds for Beeswax to persist queries in its cache. + # 7*24*60*60*1000 = 1 week + ## beeswax_running_query_lifetime=604800000L + ########################################################################### # Settings to configure Job Designer @@ -417,7 +452,7 @@ ########################################################################### -# Settings to configure Job Browser. +# Settings to configure Job Browser ########################################################################### [jobbrowser] @@ -445,17 +480,6 @@ [[ shelltypes ]] - # Define and configure a new shell type "flume" - # ------------------------------------------------------------------------ - [[[ flume ]]] - nice_name = "Flume Shell" - command = "/usr/bin/flume shell" - help = "The command-line Flume client interface." - - [[[[ environment ]]]] - # You can specify environment variables for the Flume shell - # in this section. - # Define and configure a new shell type "pig" # ------------------------------------------------------------------------ [[[ pig ]]] @@ -470,17 +494,8 @@ # [[[[[ JAVA_HOME ]]]]] # value = "/usr/lib/jvm/java-6-sun" - - # Define and configure a new shell type "sqoop2" - # ------------------------------------------------------------------------ - [[[ sqoop2 ]]] - nice_name = "Sqoop2 Shell" - command = "/usr/bin/sqoop2" - help = "The command-line Sqoop2 client." - - [[[[ environment ]]]] - # You can configure environment variables for the Sqoop2 shell - # in this section. + [[[[[ PATH ]]]]] + value = "/bin:/usr/bin:/sbin:/usr/sbin" # Define and configure a new shell type "hbase" # ------------------------------------------------------------------------ @@ -492,6 +507,28 @@ [[[[ environment ]]]] # You can configure environment variables for the HBase shell # in this section. + [[[[[ PATH ]]]]] + value = "/bin:/usr/bin:/sbin:/usr/sbin" + + # Define and configure a new shell type "Sqoop 2" + # ------------------------------------------------------------------------ + [[[ sqoop2 ]]] + nice_name = "Sqoop 2 Shell" + command = "/usr/bin/sqoop" + help = "The command-line Sqoop 2 client." + + [[[[ environment ]]]] + # You can configure environment variables for the Sqoop 2 shell + # in this section. + [[[[[ PATH ]]]]] + value = "/bin:/usr/bin:/sbin:/usr/sbin" + + # Define and configure a new shell type "bash" for testing only + # ------------------------------------------------------------------------ + [[[ bash ]]] + nice_name = "Bash (Test only!!!)" + command = "/bin/bash" + help = "A shell that does not depend on Hadoop components" ########################################################################### http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/common/hue/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/do-component-build b/bigtop-packages/src/common/hue/do-component-build index c4b3cb2..eafb4e2 100644 --- a/bigtop-packages/src/common/hue/do-component-build +++ b/bigtop-packages/src/common/hue/do-component-build @@ -16,8 +16,6 @@ set -ex -mvn -f maven/pom.xml clean install "$@" - make apps # Make the entire tree relocatable http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/common/hue/install_hue.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh index b1ff065..a3e327d 100644 --- a/bigtop-packages/src/common/hue/install_hue.sh +++ b/bigtop-packages/src/common/hue/install_hue.sh @@ -136,12 +136,6 @@ sed -i -e '/\[\[database\]\]/a\ name=/var/lib/hue/desktop.db' $PREFIX/${CONF_DIR}/conf.empty/hue.ini sed -i -e '/\[\[yarn_clusters\]\]/,+20s@## submit_to=False@submit_to=True@' \ $PREFIX/${CONF_DIR}/conf.empty/hue.ini -# Fix a redirection, since by default beeswax is not installed -sed -i -e '/meta http-equiv="refresh"/s#/beeswax#/about#' \ - $PREFIX/$LIB_DIR/desktop/core/src/desktop/templates/index.mako -# FIXME: HUE-1097 -sed -i -e '/impala.conf/d' \ - $PREFIX/$LIB_DIR/apps/beeswax/src/beeswax/server/dbms.py # Relink logs subdirectory just in case install -d -m 0755 $PREFIX/$LOG_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/deb/hue/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index a30f05a..582ee81 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -29,17 +29,9 @@ Description: A browser-based desktop interface for Hadoop Hue is a browser-based desktop interface for interacting with Hadoop. It supports a file browser, job tracker interface, cluster health monitor, and more. -# FIXME: Hue plugins don't yet quite work with Hadoop 2.X -#Package: hue-plugins -#Architecture: all -#Depends: hadoop, bigtop-utils (>= 0.6) -#Description: Plug-ins for Hadoop to enable integration with Hue -# These plug-ins enable the Hadoop Daemons to communicate with Hue. -# This package must be installed on every node in the Hadoop cluster. - Package: hue Architecture: all -Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-oozie (= ${source:Version}) +Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-oozie (= ${source:Version}), hue-pig (= ${source:Version}) Description: The hue metapackage Hue is a browser-based desktop interface for interacting with Hadoop. It supports a file browser, job tracker interface, cluster health monitor, and more. @@ -67,3 +59,11 @@ Description: A UI for Oozie on Hue . It allows users to construct and run Oozie workflows without explicitly managing the XML specification. +Package: hue-pig +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Description: A UI for Pig on Hue + A web interface for Pig. + . + It allows users to construct and run Pig jobs. + http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/deb/hue/hue-app.prerm.tpl ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-app.prerm.tpl b/bigtop-packages/src/deb/hue/hue-app.prerm.tpl index 4b96c04..a61c838 100644 --- a/bigtop-packages/src/deb/hue/hue-app.prerm.tpl +++ b/bigtop-packages/src/deb/hue/hue-app.prerm.tpl @@ -43,7 +43,7 @@ case "$1" in fi find $APP_DIR -name \*.py[co] -exec rm -f {} \; ||: find $APP_DIR -name \*.egg-info -prune -exec rm -Rf {} \; ||: - chown -R hue:hue /var/log/hue /var/lib/hue + chown -R hue:hue /var/log/hue /var/lib/hue || : ;; failed-upgrade) http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/deb/hue/hue-pig.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-pig.install b/bigtop-packages/src/deb/hue/hue-pig.install new file mode 100644 index 0000000..7ec7a31 --- /dev/null +++ b/bigtop-packages/src/deb/hue/hue-pig.install @@ -0,0 +1 @@ +/usr/lib/hue/apps/pig http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/deb/hue/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index f15b80f..a4fbd4c 100755 --- a/bigtop-packages/src/deb/hue/rules +++ b/bigtop-packages/src/deb/hue/rules @@ -23,7 +23,7 @@ # Implicit targets SHELL := /bin/bash -APPS=beeswax oozie +APPS=beeswax oozie pig $(APPS:%=debian/hue-%.postinst): debian/hue-app.postinst.tpl sed -e 's#@APP@#$(patsubst debian/hue-%.postinst,%,$@)#' < $< > $@ @@ -44,3 +44,6 @@ override_dh_auto_install: build $(APPS:%=debian/hue-%.postinst) $(APPS:%=debian/ override_dh_installinit: dh_installinit --name=hue + +override_dh_auto_test: + @echo Tests are disabled http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop-packages/src/rpm/hue/SPECS/hue.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec index 783544b..355f910 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -31,6 +31,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: %{name}-beeswax = %{version}-%{release} Requires: %{name}-oozie = %{version}-%{release} +Requires: %{name}-pig = %{version}-%{release} ################ RPM CUSTOMIZATION ############################## # Disable automatic Provides generation - otherwise we will claim to provide all of the @@ -76,6 +77,8 @@ AutoReqProv: no %define about_app_dir %{hue_dir}/apps/about %define beeswax_app_dir %{hue_dir}/apps/beeswax %define oozie_app_dir %{hue_dir}/apps/oozie +%define pig_app_dir %{hue_dir}/apps/pig +%define catalog_app_dir %{hue_dir}/apps/catalog %define filebrowser_app_dir %{hue_dir}/apps/filebrowser %define help_app_dir %{hue_dir}/apps/help %define jobbrowser_app_dir %{hue_dir}/apps/jobbrowser @@ -116,7 +119,7 @@ if [ "$1" = 0 ] ; then \ find %{apps_dir}/%1 -name \*.egg-info -type f -print0 | xargs -0 /bin/rm -fR \ fi \ find %{apps_dir}/%1 -iname \*.py[co] -type f -print0 | xargs -0 /bin/rm -f \ -chown -R hue:hue /var/log/hue /var/lib/hue +chown -R hue:hue /var/log/hue /var/lib/hue || : %description Hue is a browser-based desktop interface for interacting with Hadoop. @@ -260,6 +263,7 @@ fi %{proxy_app_dir} %{useradmin_app_dir} %{shell_app_dir} +%{catalog_app_dir} %attr(4750,root,hue) %{shell_app_dir}/src/shell/build/setuid %attr(0755,%{username},%{username}) /var/log/hue %attr(0755,%{username},%{username}) /var/lib/hue @@ -267,8 +271,7 @@ fi # beeswax, oozie are packaged as a plugin app %exclude %{beeswax_app_dir} %exclude %{oozie_app_dir} - -# %exclude %{hadoop_lib} +%exclude %{pig_app_dir} ############################################################ # No-arch packages - plugins and conf @@ -307,21 +310,6 @@ if [ $1 -ge 1 ]; then service %{name} condrestart >/dev/null 2>&1 fi -#### PLUGINS ###### -# FIXME: Hue plugins don't quite work with Hadoop 2.X -# %package -n %{name}-plugins -# Summary: Hadoop plugins for Hue -# Requires: hadoop, bigtop-utils >= 0.6 -# Group: Applications/Engineering -# %description -n %{name}-plugins -# Plugins for Hue -# -# This package should be installed on each node in the Hadoop cluster. -# -# %files -n %{name}-plugins -# %{hadoop_lib}/ - - #### HUE-BEESWAX PLUGIN ###### %package -n %{name}-beeswax Summary: A UI for Hive on Hue @@ -359,3 +347,21 @@ managing the XML specification. %files -n %{name}-oozie %{oozie_app_dir} + +#### HUE-PIG PLUGIN ###### +%package -n %{name}-pig +Summary: A UI for Pig on Hue +Group: Applications/Engineering +Requires: make +Requires: %{name}-common = %{version}-%{release} + +%description -n %{name}-pig +A web interface for Pig. + +It allows users to construct and run Pig jobs. + +%app_post_macro pig +%app_preun_macro pig + +%files -n %{name}-pig +%{pig_app_dir} http://git-wip-us.apache.org/repos/asf/bigtop/blob/7b2f77dd/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index cb052f5..ab264f0 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -192,8 +192,8 @@ $(eval $(call PACKAGE,giraph,GIRAPH)) HUE_NAME=hue HUE_RELNOTES_NAME=Hadoop User Experience HUE_PKG_NAME=hue -HUE_BASE_VERSION=2.2.0 -HUE_PKG_VERSION=2.2.0 +HUE_BASE_VERSION=2.3.0 +HUE_PKG_VERSION=2.3.0 HUE_RELEASE_VERSION=1 HUE_TARBALL_DST=hue-$(HUE_BASE_VERSION).tar.gz HUE_TARBALL_SRC=hue-$(HUE_BASE_VERSION).tgz
