Updated Branches: refs/heads/master 569554fc5 -> c74fbe7c3
BIGTOP-832. Bump version of Hue to 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9eefa559 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9eefa559 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9eefa559 Branch: refs/heads/master Commit: 9eefa5598da3e38f7bb208e40680527326e4257e Parents: 569554f Author: Roman Shaposhnik <[email protected]> Authored: Mon Mar 11 10:33:21 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu Mar 28 12:30:01 2013 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/manifests/cluster.pp | 6 + bigtop-deploy/puppet/modules/hue/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/hue/templates/hue.ini | 96 ++++++++++++--- bigtop-packages/src/common/hue/install_hue.sh | 14 +-- bigtop-packages/src/deb/hue/hue-common.install | 3 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 3 +- bigtop.mk | 6 +- 7 files changed, 93 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/bigtop-deploy/puppet/manifests/cluster.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp index 6675863..041a37a 100644 --- a/bigtop-deploy/puppet/manifests/cluster.pp +++ b/bigtop-deploy/puppet/manifests/cluster.pp @@ -78,6 +78,9 @@ class hadoop_cluster_node { $hadoop_oozie_url = "http://${hadoop_head_node}:11000/oozie"; $hadoop_httpfs_url = "http://${hadoop_head_node}:14000/webhdfs/v1"; + $hadoop_rm_url = "http://${hadoop_head_node}:8088"; + $hadoop_rm_proxy_url = "http://${hadoop_head_node}:8088"; + $hadoop_history_server_url = "http://${hadoop_head_node}:19888"; $solrcloud_collections = ["collection1"] $solrcloud_port = "1978" @@ -211,6 +214,9 @@ class hadoop_head_node inherits hadoop_cluster_node { } hue::server { "hue server": + rm_url => $hadoop_rm_url, + rm_proxy_url => $hadoop_rm_proxy_url, + history_server_url => $hadoop_history_server_url, webhdfs_url => $hadoop_httpfs_url, rm_host => $hadoop_rm_host, rm_port => $hadoop_rm_port, http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/bigtop-deploy/puppet/modules/hue/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp index b7fed81..f4a7b57 100644 --- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp @@ -14,7 +14,7 @@ # limitations under the License. class hue { - define server($webhdfs_url, $rm_host, $rm_port, $oozie_url, + define server($webhdfs_url, $rm_host, $rm_port, $oozie_url, $rm_url, $rm_proxy_url, $history_server_url, $hue_host = "0.0.0.0", $hue_port = "8888", $default_fs = "hdfs://localhost:8020", $kerberos_realm = "") { if ($kerberos_realm) { http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/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 1bc3b1c..d9fd161 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 ########################################################################### @@ -48,6 +48,12 @@ # Turn off backtrace for server error http_500_debug_mode=0 + # Server email for internal error messages + ## django_server_email='[email protected]' + + # Email backend + ## django_email_backend=django.core.mail.backends.smtp.EmailBackend + # Set to true to use CherryPy as the webserver, set to false # to use Spawning as the webserver. Defaults to Spawning if # key is not specified. @@ -73,6 +79,13 @@ # Default encoding for site data ## default_site_encoding=utf-8 + # Administrators + # ---------------- + [[django_admins]] + ## [[[admin1]]] + ## name=john + ## [email protected] + # UI customizations # ------------------- [[custom]] @@ -91,10 +104,22 @@ # (Default. Relies on Django and user manager, after the first login) # - desktop.auth.backend.LdapBackend # - desktop.auth.backend.PamBackend + # - desktop.auth.backend.SpnegoDjangoBackend + # - desktop.auth.backend.RemoteUserDjangoBackend ## backend=desktop.auth.backend.AllowFirstUserDjangoBackend ## pam_service=login + # When using the desktop.auth.backend.RemoteUserDjangoBackend, this sets + # the normalized name of the header that contains the remote user. + # The HTTP header in the request is converted to a key by converting + # all characters to uppercase, replacing any hyphens with underscores + # and adding an HTTP_ prefix to the name. So, for example, if the header + # is called Remote-User that would be configured as HTTP_REMOTE_USER + # + # Defaults to HTTP_REMOTE_USER + ## remote_user_header=HTTP_REMOTE_USER + # Configuration options for connecting to LDAP and Active Directory # ------------------------------------------------------------------- [[ldap]] @@ -123,6 +148,10 @@ # For use when using LdapBackend for Hue authentication ## ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com" + # Create users in Hue when they try to login with their LDAP credentials + # For use when using LdapBackend for Hue authentication + ## create_users_on_login = true + [[[users]]] # Base filter for searching for users @@ -149,7 +178,7 @@ engine=sqlite3 name=/var/lib/hue/desktop.db # Database engine is typically one of: - # postgresql, mysql, sqlite3, or oracle + # postgresql_psycopg2, mysql, or sqlite3 # # Note that for sqlite3, 'name', below is a filename; # for other backends, it is the database name. @@ -277,10 +306,19 @@ hadoop_mapred_home=/usr/lib/hadoop-mapreduce # Defaults to $HADOOP_BIN or /usr/bin/hadoop - ## hadoop_bin=/usr/bin/hadoop + hadoop_bin=/usr/bin/hadoop # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf - ## hadoop_conf_dir=/etc/hadoop/conf + hadoop_conf_dir=/etc/hadoop/conf + + # URL of the ResourceManager API + resourcemanager_api_url=<%= rm_url %> + + # URL of the ProxyServer API + proxy_api_url=<%= rm_proxy_url %> + + # URL of the HistoryServer API + history_server_api_url=<%= history_server_url %> ########################################################################### @@ -325,13 +363,22 @@ ########################################################################### [beeswax] - # Configure the port the internal metastore daemon runs on. Used only if - # hive.metastore.local is true. - ## beeswax_meta_server_port=8003 - # Configure the port the beeswax thrift server runs on + # Host where Beeswax server Thrift daemon is running. + # If Kerberos security is enabled, the fully-qualified domain name (FQDN) is + # required, even if the Thrift daemon is running on the same host as Hue. + ## beeswax_server_host=<FQDN of Beeswax Server> + + # Port where Beeswax Thrift server runs on. ## beeswax_server_port=8002 + # Host where internal metastore Thrift daemon is running. + ## beeswax_meta_server_host=localhost + + # Configure the port the internal metastore daemon runs on. + # Used only if hive.metastore.local is true. + ## beeswax_meta_server_port=8003 + # Hive home directory ## hive_home_dir=/usr/lib/hive @@ -406,8 +453,8 @@ help = "The command-line Flume client interface." [[[[ environment ]]]] - # You can specify environment variables for the Flume shell - # in this section. + # You can specify environment variables for the Flume shell + # in this section. # Define and configure a new shell type "pig" # ------------------------------------------------------------------------ @@ -417,12 +464,23 @@ help = "The command-line interpreter for Pig" [[[[ environment ]]]] - # You can specify environment variables for the Pig shell - # in this section. Note that JAVA_HOME must be configured - # for the Pig shell to run. + # You can specify environment variables for the Pig shell + # in this section. Note that JAVA_HOME must be configured + # for the Pig shell to run. + + # [[[[[ JAVA_HOME ]]]]] + # value = "/usr/lib/jvm/java-6-sun" - [[[[[ 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. # Define and configure a new shell type "hbase" # ------------------------------------------------------------------------ @@ -432,8 +490,8 @@ help = "The command-line HBase client interface." [[[[ environment ]]]] - # You can configure environment variables for the HBase shell - # in this section. + # You can configure environment variables for the HBase shell + # in this section. ########################################################################### @@ -442,4 +500,4 @@ [useradmin] # The name of the default user group that users will be a member of - ## default_user_group=default_group + ## default_user_group=default http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/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 d2ad6b4..b1ff065 100644 --- a/bigtop-packages/src/common/hue/install_hue.sh +++ b/bigtop-packages/src/common/hue/install_hue.sh @@ -111,8 +111,7 @@ cp -f $BUILD_DIR/apps/shell/src/shell/build/setuid $PREFIX/$LIB_DIR/apps/shell/s # Remove Hue database and then recreate it, but with just the "right" apps rm -f $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$LIB_DIR/app.reg -# FIXME: jobbrowser HUE-10 -APPS="about filebrowser help jobsub proxy useradmin shell" +APPS="about filebrowser jobbrowser help jobsub proxy useradmin shell" export DESKTOP_LOG_DIR=$BUILD_DIR export DESKTOP_LOGLEVEL=WARN export ROOT=$PREFIX/$LIB_DIR @@ -140,14 +139,9 @@ sed -i -e '/\[\[yarn_clusters\]\]/,+20s@## submit_to=False@submit_to=True@' \ # 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-880 -sed -i -e '/"name": *"Hive"/,/description/s#"parameters":.*$#"parameters": "[{\\"name\\":\\"oozie.use.system.libpath\\",\\"value\\":\\"true\\"}]",#' \ - -e '/"name": *"Pig"/,/description/s#"parameters":.*$#"parameters": "[{\\"name\\":\\"oozie.use.system.libpath\\",\\"value\\":\\"true\\"}]",#' \ - -e '/"name": *"Sqoop"/,/description/s#"parameters":.*$#"parameters": "[{\\"name\\":\\"oozie.use.system.libpath\\",\\"value\\":\\"true\\"}]",#' \ - -e '/"name": *"DistCp"/,/description/s#"parameters":.*$#"parameters": "[{\\"name\\":\\"oozie.use.system.libpath\\",\\"value\\":\\"true\\"}]",#' \ - $PREFIX/$LIB_DIR/apps/oozie/src/oozie/fixtures/initial_example_data.json -sed -i -e '/jobbrowser.views/s#<a href=[^>]*>#<a href=".">#' \ - $PREFIX/$LIB_DIR/apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.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/9eefa559/bigtop-packages/src/deb/hue/hue-common.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-common.install b/bigtop-packages/src/deb/hue/hue-common.install index 24d5753..20dd95e 100644 --- a/bigtop-packages/src/deb/hue/hue-common.install +++ b/bigtop-packages/src/deb/hue/hue-common.install @@ -19,8 +19,7 @@ /usr/lib/hue/apps/about /usr/lib/hue/apps/filebrowser /usr/lib/hue/apps/help -# FIXME: HUE-10 -# /usr/lib/hue/apps/jobbrowser +/usr/lib/hue/apps/jobbrowser /usr/lib/hue/apps/jobsub /usr/lib/hue/apps/proxy /usr/lib/hue/apps/shell http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/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 d11828a..7861057 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -255,8 +255,7 @@ fi %{about_app_dir} %{filebrowser_app_dir} %{help_app_dir} -# FIXME: HUE-10 -# %{jobbrowser_app_dir} +%{jobbrowser_app_dir} %{jobsub_app_dir} %{proxy_app_dir} %{useradmin_app_dir} http://git-wip-us.apache.org/repos/asf/bigtop/blob/9eefa559/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 3fda56c..44f6168 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -190,12 +190,12 @@ $(eval $(call PACKAGE,giraph,GIRAPH)) HUE_NAME=hue HUE_RELNOTES_NAME=Hadoop User Experience HUE_PKG_NAME=hue -HUE_BASE_VERSION=2.1.0 -HUE_PKG_VERSION=2.1.0 +HUE_BASE_VERSION=2.2.0 +HUE_PKG_VERSION=2.2.0 HUE_RELEASE_VERSION=1 HUE_TARBALL_DST=hue-$(HUE_BASE_VERSION).tar.gz HUE_TARBALL_SRC=hue-$(HUE_BASE_VERSION).tgz -HUE_SITE=https://github.com/downloads/cloudera/hue +HUE_SITE=http://cloudera.github.com/hue/releases/$(HUE_BASE_VERSION) HUE_ARCHIVE=$(HUE_SITE) $(eval $(call PACKAGE,hue,HUE))
