ambari git commit: AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/trunk d797c7eb2 -> 6bb86b103


AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bb86b10
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bb86b10
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bb86b10

Branch: refs/heads/trunk
Commit: 6bb86b10360cfa1611a401f08f06b05c5a63a535
Parents: d797c7e
Author: Dipayan Bhowmick 
Authored: Tue Feb 14 12:17:11 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Tue Feb 14 13:27:48 2017 +0530

--
 .../resources/ui/app/components/create-table.js |  6 +++-
 .../resources/ui/app/configs/file-format.js |  4 ++-
 .../resources/ui/app/controllers/messages.js| 30 
 .../ui/app/controllers/messages/message.js  | 31 
 .../app/helpers/alert-message-context-class.js  | 27 ++
 .../ui/app/helpers/alert-message-icon-class.js  | 37 
 .../resources/ui/app/helpers/shorten-text.js| 32 +
 .../main/resources/ui/app/mixins/ui-logger.js   | 33 +
 .../main/resources/ui/app/routes/databases.js   | 12 ---
 .../databases/database/tables/new-database.js   | 15 
 .../app/routes/databases/database/tables/new.js |  8 +++--
 .../routes/databases/database/tables/table.js   |  8 +++--
 .../databases/database/tables/table/edit.js | 16 -
 .../databases/database/tables/table/rename.js   | 15 
 .../src/main/resources/ui/app/routes/jobs.js|  3 --
 .../main/resources/ui/app/routes/settings.js| 10 +++---
 .../resources/ui/app/services/alert-messages.js | 13 ---
 .../ui/app/templates/databases-loading.hbs  | 21 +++
 .../databases/database/tables-loading.hbs   | 24 +
 .../databases/database/tables/table-loading.hbs | 21 +++
 .../resources/ui/app/templates/jobs-loading.hbs | 20 +++
 .../resources/ui/app/templates/messages.hbs | 14 +++-
 .../ui/app/templates/messages/message.hbs   |  6 ++--
 .../ui/app/templates/savedqueries-loading.hbs   | 21 +++
 .../ui/app/templates/settings-loading.hbs   | 21 +++
 .../resources/ui/app/templates/udfs-loading.hbs | 21 +++
 .../src/main/resources/ui/config/environment.js |  2 +-
 27 files changed, 405 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6bb86b10/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
index f31d37f..670ebd7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
@@ -18,13 +18,17 @@
 
 import Ember from 'ember';
 import Helper from '../configs/helpers';
+import FileFormats from '../configs/file-format';
 
 export default Ember.Component.extend({
   init() {
 this._super(...arguments);
+let defaultFileFormat = FileFormats.findBy('default', true);
 this.set('columns', Ember.A());
 this.set('properties', []);
-this.set('settings', {});
+this.set('settings', {
+  fileFormat: { type: defaultFileFormat.name}
+});
 this.set('shouldAddBuckets', null);
 this.set('settingErrors', []);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bb86b10/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js 
b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
index 4042b63..afcba6e 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-export default [
+let fileFormats = [
   {name: "SEQUENCEFILE", default: false, custom: false},
   {name: "TEXTFILE", default: false, custom: false},
   {name: "RCFILE", default: false, custom: false},
@@ -24,3 +24,5 @@ export default [
   {name: "AVRO", default: false, custom: false},
   {name: "CUSTOM SerDe", default: false, custom: true},
 ];
+
+export default fileFormats;

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bb86b10/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js
--
diff --git 

ambari git commit: AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 706a3dfe0 -> c2952d059


AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2952d05
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2952d05
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2952d05

Branch: refs/heads/branch-2.5
Commit: c2952d059b69bf27d4953105e3278782b664ce03
Parents: 706a3df
Author: Dipayan Bhowmick 
Authored: Tue Feb 14 12:17:11 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Tue Feb 14 13:26:53 2017 +0530

--
 .../resources/ui/app/components/create-table.js |  6 +++-
 .../resources/ui/app/configs/file-format.js |  4 ++-
 .../resources/ui/app/controllers/messages.js| 30 
 .../ui/app/controllers/messages/message.js  | 31 
 .../app/helpers/alert-message-context-class.js  | 27 ++
 .../ui/app/helpers/alert-message-icon-class.js  | 37 
 .../resources/ui/app/helpers/shorten-text.js| 32 +
 .../main/resources/ui/app/mixins/ui-logger.js   | 33 +
 .../main/resources/ui/app/routes/databases.js   | 12 ---
 .../databases/database/tables/new-database.js   | 15 
 .../app/routes/databases/database/tables/new.js |  8 +++--
 .../routes/databases/database/tables/table.js   |  8 +++--
 .../databases/database/tables/table/edit.js | 16 -
 .../databases/database/tables/table/rename.js   | 15 
 .../src/main/resources/ui/app/routes/jobs.js|  3 --
 .../main/resources/ui/app/routes/settings.js| 10 +++---
 .../resources/ui/app/services/alert-messages.js | 13 ---
 .../ui/app/templates/databases-loading.hbs  | 21 +++
 .../databases/database/tables-loading.hbs   | 24 +
 .../databases/database/tables/table-loading.hbs | 21 +++
 .../resources/ui/app/templates/jobs-loading.hbs | 20 +++
 .../resources/ui/app/templates/messages.hbs | 14 +++-
 .../ui/app/templates/messages/message.hbs   |  6 ++--
 .../ui/app/templates/savedqueries-loading.hbs   | 21 +++
 .../ui/app/templates/settings-loading.hbs   | 21 +++
 .../resources/ui/app/templates/udfs-loading.hbs | 21 +++
 .../src/main/resources/ui/config/environment.js |  2 +-
 27 files changed, 405 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c2952d05/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
index f31d37f..670ebd7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
@@ -18,13 +18,17 @@
 
 import Ember from 'ember';
 import Helper from '../configs/helpers';
+import FileFormats from '../configs/file-format';
 
 export default Ember.Component.extend({
   init() {
 this._super(...arguments);
+let defaultFileFormat = FileFormats.findBy('default', true);
 this.set('columns', Ember.A());
 this.set('properties', []);
-this.set('settings', {});
+this.set('settings', {
+  fileFormat: { type: defaultFileFormat.name}
+});
 this.set('shouldAddBuckets', null);
 this.set('settingErrors', []);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2952d05/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js 
b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
index 4042b63..afcba6e 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-export default [
+let fileFormats = [
   {name: "SEQUENCEFILE", default: false, custom: false},
   {name: "TEXTFILE", default: false, custom: false},
   {name: "RCFILE", default: false, custom: false},
@@ -24,3 +24,5 @@ export default [
   {name: "AVRO", default: false, custom: false},
   {name: "CUSTOM SerDe", default: false, custom: true},
 ];
+
+export default fileFormats;

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2952d05/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js
--
diff --git 

ambari git commit: AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a8f720024 -> 706a3dfe0


AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/706a3dfe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/706a3dfe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/706a3dfe

Branch: refs/heads/branch-2.5
Commit: 706a3dfe0b2250bf9d36d19ddebb48869a608c07
Parents: a8f7200
Author: Attila Doroszlai 
Authored: Fri Feb 10 13:29:18 2017 +0100
Committer: Attila Doroszlai 
Committed: Tue Feb 14 08:40:25 2017 +0100

--
 ambari-server/src/main/python/ambari-server.py  |  2 ++
 .../main/python/ambari_server/serverSetup.py| 11 ---
 .../src/test/python/TestAmbariServer.py | 32 
 3 files changed, 28 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/706a3dfe/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py 
b/ambari-server/src/main/python/ambari-server.py
index 845a9f6..e7ffe4e 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -398,6 +398,7 @@ def init_parser_options(parser):
 help="Specifies the path to the JDBC driver JAR file")
   parser.add_option('--skip-properties-validation', action="store_true", 
default=False, help="Skip properties file validation", 
dest="skip_properties_validation")
   parser.add_option('--skip-database-check', action="store_true", 
default=False, help="Skip database consistency check", 
dest="skip_database_check")
+  parser.add_option('--skip-view-extraction', action="store_true", 
default=False, help="Skip extraction of system views", 
dest="skip_view_extraction")
   parser.add_option('--auto-fix-database', action="store_true", default=False, 
help="Automatically fix database consistency issues", 
dest="fix_database_consistency")
   add_parser_options('--mpack',
   default=None,
@@ -500,6 +501,7 @@ def init_parser_options(parser):
   parser.add_option('--version-display-name', default=None, help="Display name 
of desired repo version", dest="desired_repo_version")
   parser.add_option('--skip-properties-validation', action="store_true", 
default=False, help="Skip properties file validation", 
dest="skip_properties_validation")
   parser.add_option('--skip-database-check', action="store_true", 
default=False, help="Skip database consistency check", 
dest="skip_database_check")
+  parser.add_option('--skip-view-extraction', action="store_true", 
default=False, help="Skip extraction of system views", 
dest="skip_view_extraction")
   parser.add_option('--auto-fix-database', action="store_true", default=False, 
help="Automatically fix database consistency issues", 
dest="fix_database_consistency")
   parser.add_option('--force-version', action="store_true", default=False, 
help="Force version to current", dest="force_repo_version")
   parser.add_option('--version', dest="stack_versions", default=None, 
action="append", type="string",

http://git-wip-us.apache.org/repos/asf/ambari/blob/706a3dfe/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py 
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 42ef51f..c1643f2 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -1145,11 +1145,12 @@ def setup(options):
 
   check_jdbc_drivers(options)
 
-  print 'Extracting system views...'
-  retcode = extract_views(options)
-  if not retcode == 0:
-err = 'Error while extracting system views. Exiting'
-raise FatalException(retcode, err)
+  if not options.skip_view_extraction:
+print 'Extracting system views...'
+retcode = extract_views(options)
+if not retcode == 0:
+  err = 'Error while extracting system views. Exiting'
+  raise FatalException(retcode, err)
 
   # we've already done this, but new files were created so run it one time.
   adjust_directory_permissions(svc_user)

http://git-wip-us.apache.org/repos/asf/ambari/blob/706a3dfe/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index 526680b..8692030 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py

ambari git commit: AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/trunk fcf396f3d -> d797c7eb2


AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d797c7eb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d797c7eb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d797c7eb

Branch: refs/heads/trunk
Commit: d797c7eb250552e6655c96e68eba93961d3d70fb
Parents: fcf396f
Author: Attila Doroszlai 
Authored: Fri Feb 10 13:29:18 2017 +0100
Committer: Attila Doroszlai 
Committed: Tue Feb 14 08:36:41 2017 +0100

--
 ambari-server/src/main/python/ambari-server.py  |  2 ++
 .../main/python/ambari_server/serverSetup.py| 11 ---
 .../src/test/python/TestAmbariServer.py | 32 
 3 files changed, 28 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d797c7eb/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py 
b/ambari-server/src/main/python/ambari-server.py
index 5d4f5d7..5002cd0 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -401,6 +401,7 @@ def init_parser_options(parser):
 help="Specifies the path to the JDBC driver JAR file")
   parser.add_option('--skip-properties-validation', action="store_true", 
default=False, help="Skip properties file validation", 
dest="skip_properties_validation")
   parser.add_option('--skip-database-check', action="store_true", 
default=False, help="Skip database consistency check", 
dest="skip_database_check")
+  parser.add_option('--skip-view-extraction', action="store_true", 
default=False, help="Skip extraction of system views", 
dest="skip_view_extraction")
   parser.add_option('--auto-fix-database', action="store_true", default=False, 
help="Automatically fix database consistency issues", 
dest="fix_database_consistency")
   add_parser_options('--mpack',
   default=None,
@@ -503,6 +504,7 @@ def init_parser_options(parser):
   parser.add_option('--version-display-name', default=None, help="Display name 
of desired repo version", dest="desired_repo_version")
   parser.add_option('--skip-properties-validation', action="store_true", 
default=False, help="Skip properties file validation", 
dest="skip_properties_validation")
   parser.add_option('--skip-database-check', action="store_true", 
default=False, help="Skip database consistency check", 
dest="skip_database_check")
+  parser.add_option('--skip-view-extraction', action="store_true", 
default=False, help="Skip extraction of system views", 
dest="skip_view_extraction")
   parser.add_option('--auto-fix-database', action="store_true", default=False, 
help="Automatically fix database consistency issues", 
dest="fix_database_consistency")
   parser.add_option('--force-version', action="store_true", default=False, 
help="Force version to current", dest="force_repo_version")
   parser.add_option('--version', dest="stack_versions", default=None, 
action="append", type="string",

http://git-wip-us.apache.org/repos/asf/ambari/blob/d797c7eb/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py 
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 8a06034..c6de088 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -1146,11 +1146,12 @@ def setup(options):
 
   check_jdbc_drivers(options)
 
-  print 'Extracting system views...'
-  retcode = extract_views(options)
-  if not retcode == 0:
-err = 'Error while extracting system views. Exiting'
-raise FatalException(retcode, err)
+  if not options.skip_view_extraction:
+print 'Extracting system views...'
+retcode = extract_views(options)
+if not retcode == 0:
+  err = 'Error while extracting system views. Exiting'
+  raise FatalException(retcode, err)
 
   # we've already done this, but new files were created so run it one time.
   adjust_directory_permissions(svc_user)

http://git-wip-us.apache.org/repos/asf/ambari/blob/d797c7eb/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index 7dae7c0..0f704f9 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ 

ambari git commit: AMBARI-19985. Workflow Manager Styling changes (Madhan Mohan Reddy via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 2eeb0a0ac -> a8f720024


AMBARI-19985. Workflow Manager Styling changes (Madhan Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8f72002
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8f72002
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8f72002

Branch: refs/heads/branch-2.5
Commit: a8f72002418742f833fc05dcabdf7aa0cae4a9f9
Parents: 2eeb0a0
Author: Gaurav Nagar 
Authored: Tue Feb 14 11:46:36 2017 +0530
Committer: Gaurav Nagar 
Committed: Tue Feb 14 11:47:12 2017 +0530

--
 .../ui/app/components/flow-designer.js  |  3 --
 .../resources/ui/app/components/job-details.js  | 16 +--
 .../src/main/resources/ui/app/styles/app.less   | 27 +---
 .../templates/components/designer-workspace.hbs |  2 +-
 .../app/templates/components/flow-designer.hbs  | 14 +++---
 .../ui/app/templates/components/job-config.hbs  |  4 +-
 .../ui/app/templates/components/job-details.hbs | 46 ++--
 .../ui/app/templates/components/save-wf.hbs |  6 +--
 .../components/search-create-new-bar.hbs|  2 +-
 .../app/templates/components/search-table.hbs   |  2 +-
 .../templates/components/workflow-actions.hbs   |  4 +-
 .../components/workflow-job-details.hbs | 14 +-
 .../main/resources/ui/app/utils/constants.js|  3 +-
 13 files changed, 88 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8f72002/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 83a1b27..a5536af 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -341,7 +341,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.set("workflowFilePath", filePath);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing.Please try 
again.");
   self.showingErrorMsgInDesigner(data);
   self.set("isWorkflowImporting", false);
@@ -999,7 +998,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.importActionSettingsFromString(data);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing 
asset.Please try again.");
   self.showingErrorMsgInDesigner(data);
 });
@@ -1018,7 +1016,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.importActionNodeFromString(data);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing asset. 
Please try again.");
   self.showingErrorMsgInDesigner(data);
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8f72002/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
index d1343b0..fe60793 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
@@ -23,6 +23,7 @@ import Constants from '../utils/constants';
 export default Ember.Component.extend({
   workflowImporter: WorkflowImporter.create({}),
   actionTypeResolver: ActionTypeResolver.create({}),
+  layoutConfigs: { name: 'dagre', fit: false, edgeSep: 100 },
   error : {},
   errorMessage : Ember.computed('error', function() {
 if(this.get('error').status === 400){
@@ -261,6 +262,13 @@ export default Ember.Component.extend({
   var workflow = wfObject.workflow;
   console.log("Workflow Object..", workflow);
   var dataNodes=this.getCyDataNodes(workflow);
+  if (dataNodes.length > Constants.flowGraphMaxNodeCount) {
+this.set("model.flowGraphMaxNodeCountReached", true);
+this.set("model.inProgress", false);
+return;
+  } else {
+

ambari git commit: AMBARI-19985. Workflow Manager Styling changes (Madhan Mohan Reddy via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk 069ad4d7a -> fcf396f3d


AMBARI-19985. Workflow Manager Styling changes (Madhan Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fcf396f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fcf396f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fcf396f3

Branch: refs/heads/trunk
Commit: fcf396f3d9bf774c89af8d683e9e22fa1e9188c0
Parents: 069ad4d
Author: Gaurav Nagar 
Authored: Tue Feb 14 11:46:36 2017 +0530
Committer: Gaurav Nagar 
Committed: Tue Feb 14 11:46:36 2017 +0530

--
 .../ui/app/components/flow-designer.js  |  3 --
 .../resources/ui/app/components/job-details.js  | 16 +--
 .../src/main/resources/ui/app/styles/app.less   | 27 +---
 .../templates/components/designer-workspace.hbs |  2 +-
 .../app/templates/components/flow-designer.hbs  | 14 +++---
 .../ui/app/templates/components/job-config.hbs  |  4 +-
 .../ui/app/templates/components/job-details.hbs | 46 ++--
 .../ui/app/templates/components/save-wf.hbs |  6 +--
 .../components/search-create-new-bar.hbs|  2 +-
 .../app/templates/components/search-table.hbs   |  2 +-
 .../templates/components/workflow-actions.hbs   |  4 +-
 .../components/workflow-job-details.hbs | 14 +-
 .../main/resources/ui/app/utils/constants.js|  3 +-
 13 files changed, 88 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fcf396f3/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 83a1b27..a5536af 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -341,7 +341,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.set("workflowFilePath", filePath);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing.Please try 
again.");
   self.showingErrorMsgInDesigner(data);
   self.set("isWorkflowImporting", false);
@@ -999,7 +998,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.importActionSettingsFromString(data);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing 
asset.Please try again.");
   self.showingErrorMsgInDesigner(data);
 });
@@ -1018,7 +1016,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.importActionNodeFromString(data);
 }.bind(this)).catch(function(data){
   console.error(data);
-  var stackTraceMsg = self.getStackTrace(data.responseText);
   self.set("errorMsg", "There is some problem while importing asset. 
Please try again.");
   self.showingErrorMsgInDesigner(data);
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/fcf396f3/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
index d1343b0..fe60793 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
@@ -23,6 +23,7 @@ import Constants from '../utils/constants';
 export default Ember.Component.extend({
   workflowImporter: WorkflowImporter.create({}),
   actionTypeResolver: ActionTypeResolver.create({}),
+  layoutConfigs: { name: 'dagre', fit: false, edgeSep: 100 },
   error : {},
   errorMessage : Ember.computed('error', function() {
 if(this.get('error').status === 400){
@@ -261,6 +262,13 @@ export default Ember.Component.extend({
   var workflow = wfObject.workflow;
   console.log("Workflow Object..", workflow);
   var dataNodes=this.getCyDataNodes(workflow);
+  if (dataNodes.length > Constants.flowGraphMaxNodeCount) {
+this.set("model.flowGraphMaxNodeCountReached", true);
+this.set("model.inProgress", false);
+return;
+  } else {
+

ambari git commit: AMBARI-19980. Hive1.5 View in Ambari shows wrong status.(gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0392cabda -> 2eeb0a0ac


AMBARI-19980. Hive1.5 View in Ambari shows wrong status.(gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2eeb0a0a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2eeb0a0a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2eeb0a0a

Branch: refs/heads/branch-2.5
Commit: 2eeb0a0ac4cafebba75789de786af7af774dda64
Parents: 0392cab
Author: Gaurav Nagar 
Authored: Tue Feb 14 11:34:51 2017 +0530
Committer: Gaurav Nagar 
Committed: Tue Feb 14 11:34:51 2017 +0530

--
 .../ui/hive-web/app/controllers/index/history-query/logs.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2eeb0a0a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
index 2b5fd26..ae09cdd 100644
--- 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
+++ 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
@@ -94,6 +94,7 @@ export default Ember.ObjectController.extend({
 handleError(err);
   });
 }, function (err) {
+  job.set('status', constants.statuses.error);
   handleError(err);
 });
   },

ambari git commit: AMBARI-19980. Hive1.5 View in Ambari shows wrong status.(gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk 31944e382 -> 069ad4d7a


AMBARI-19980. Hive1.5 View in Ambari shows wrong status.(gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/069ad4d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/069ad4d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/069ad4d7

Branch: refs/heads/trunk
Commit: 069ad4d7a239c356fb6cd35b45f80aa3ea36a296
Parents: 31944e3
Author: Gaurav Nagar 
Authored: Tue Feb 14 11:34:51 2017 +0530
Committer: Gaurav Nagar 
Committed: Tue Feb 14 11:35:28 2017 +0530

--
 .../ui/hive-web/app/controllers/index/history-query/logs.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/069ad4d7/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
index 2b5fd26..ae09cdd 100644
--- 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
+++ 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index/history-query/logs.js
@@ -94,6 +94,7 @@ export default Ember.ObjectController.extend({
 handleError(err);
   });
 }, function (err) {
+  job.set('status', constants.statuses.error);
   handleError(err);
 });
   },

ambari git commit: AMBARI-19897 : Provide user-warning while upgrading clusters to move certificates/keystores/truststores out of conf folder (Vishal Suvagia via mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 809453d4d -> 0392cabda


AMBARI-19897 : Provide user-warning while upgrading clusters to move 
certificates/keystores/truststores out of conf folder (Vishal Suvagia via 
mugdha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0392cabd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0392cabd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0392cabd

Branch: refs/heads/branch-2.5
Commit: 0392cabdab5ad6469e08f404370f35cd14cfd0bf
Parents: 809453d
Author: Vishal Suvagia 
Authored: Fri Feb 10 16:37:38 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Feb 14 10:33:44 2017 +0530

--
 .../ambari/server/checks/CheckDescription.java  |   7 +
 .../server/checks/RangerSSLConfigCheck.java |  81 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   1 +
 .../server/checks/RangerSSLConfigCheckTest.java | 150 +++
 9 files changed, 244 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0392cabd/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 8d8f540..2d1468f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -320,6 +320,13 @@ public class CheckDescription {
   .put(AbstractCheckDescriptor.DEFAULT,
 "Auto-Start must be disabled before performing an Upgrade").build());
 
+  public static CheckDescription RANGER_SSL_CONFIG_CHECK = new 
CheckDescription("RANGER_SSL_CONFIG_CHECK",
+PrereqCheckType.SERVICE,
+"Change Ranger SSL configuration path for Keystore and Truststore.",
+new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT,
+  "As Ranger is SSL enabled, Ranger SSL configurations will need 
to be changed from default value of /etc/ranger/*/conf folder to 
/etc/ranger/security. " +
+  "Since the certificates/keystores/truststores in this path may 
affect the upgrade/downgrade process, it is recommended to manually move the 
certificates/keystores/truststores out of the conf folders and change the 
appropriate config values before proceeding.").build());
 
   private String m_name;
   private PrereqCheckType m_type;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0392cabd/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
new file mode 100644
index 000..02f6559
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ */
+package org.apache.ambari.server.checks;
+
+
+import java.util.Arrays;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Singleton;
+
+
+/**
+ * This service check will mainly be for 2.6 stacks so as 

ambari git commit: AMBARI-19897 : Provide user-warning while upgrading clusters to move certificates/keystores/truststores out of conf folder (Vishal Suvagia via mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/trunk 399b70835 -> 31944e382


AMBARI-19897 : Provide user-warning while upgrading clusters to move 
certificates/keystores/truststores out of conf folder (Vishal Suvagia via 
mugdha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31944e38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31944e38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31944e38

Branch: refs/heads/trunk
Commit: 31944e382019482ee40e8ec4c691b6aea7fce230
Parents: 399b708
Author: Vishal Suvagia 
Authored: Fri Feb 10 16:37:38 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Feb 14 10:31:39 2017 +0530

--
 .../ambari/server/checks/CheckDescription.java  |   7 +
 .../server/checks/RangerSSLConfigCheck.java |  81 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   1 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   1 +
 .../server/checks/RangerSSLConfigCheckTest.java | 150 +++
 9 files changed, 244 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31944e38/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 8d8f540..2d1468f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -320,6 +320,13 @@ public class CheckDescription {
   .put(AbstractCheckDescriptor.DEFAULT,
 "Auto-Start must be disabled before performing an Upgrade").build());
 
+  public static CheckDescription RANGER_SSL_CONFIG_CHECK = new 
CheckDescription("RANGER_SSL_CONFIG_CHECK",
+PrereqCheckType.SERVICE,
+"Change Ranger SSL configuration path for Keystore and Truststore.",
+new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT,
+  "As Ranger is SSL enabled, Ranger SSL configurations will need 
to be changed from default value of /etc/ranger/*/conf folder to 
/etc/ranger/security. " +
+  "Since the certificates/keystores/truststores in this path may 
affect the upgrade/downgrade process, it is recommended to manually move the 
certificates/keystores/truststores out of the conf folders and change the 
appropriate config values before proceeding.").build());
 
   private String m_name;
   private PrereqCheckType m_type;

http://git-wip-us.apache.org/repos/asf/ambari/blob/31944e38/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
new file mode 100644
index 000..02f6559
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ */
+package org.apache.ambari.server.checks;
+
+
+import java.util.Arrays;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Singleton;
+
+
+/**
+ * This service check will mainly be for 2.6 stacks so as to 

ambari git commit: AMBARI-19992 : Hive metrics are not collected if AMS HTTPS is enabled. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk b31bef74c -> 399b70835


AMBARI-19992 : Hive metrics are not collected if AMS HTTPS is enabled. 
(avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/399b7083
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/399b7083
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/399b7083

Branch: refs/heads/trunk
Commit: 399b70835fa076377018e6aa40de762df0c1e5fc
Parents: b31bef7
Author: Aravindan Vijayan 
Authored: Mon Feb 13 17:50:47 2017 -0800
Committer: Aravindan Vijayan 
Committed: Mon Feb 13 17:50:47 2017 -0800

--
 .../package/templates/hadoop-metrics2-hivemetastore.properties.j2   | 1 +
 .../package/templates/hadoop-metrics2-hiveserver2.properties.j2 | 1 +
 .../HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 | 1 +
 .../package/templates/hadoop-metrics2-llaptaskscheduler.j2  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/399b7083/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
index d2e43e9..82f71c5 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
@@ -50,6 +50,7 @@
 
   hivemetastore.sink.timeline.collector.hosts={{ams_collector_hosts}}
   hivemetastore.sink.timeline.port={{metric_collector_port}}
+  hivemetastore.sink.timeline.protocol={{metric_collector_protocol}}
 
 
 {% endif %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/399b7083/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
index ed89679..f1bfa03 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
@@ -50,5 +50,6 @@
 
   hiveserver2.sink.timeline.collector.hosts={{ams_collector_hosts}}
   hiveserver2.sink.timeline.port={{metric_collector_port}}
+  hiveserver2.sink.timeline.protocol={{metric_collector_protocol}}
 
 {% endif %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/399b7083/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
index 6b609dd..d63dfb7 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
@@ -49,5 +49,6 @@
 
   llapdaemon.sink.timeline.collector.hosts={{ams_collector_hosts}}
   llapdaemon.sink.timeline.port={{metric_collector_port}}
+  llapdaemon.sink.timeline.protocol={{metric_collector_protocol}}
 
 {% endif %}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/399b7083/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
index c229b75..4c9c981 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
+++ 

ambari git commit: AMBARI-19992 : Hive metrics are not collected if AMS HTTPS is enabled. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f8863d26b -> 809453d4d


AMBARI-19992 : Hive metrics are not collected if AMS HTTPS is enabled. 
(avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/809453d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/809453d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/809453d4

Branch: refs/heads/branch-2.5
Commit: 809453d4d026481c412ec42c144618342601da5a
Parents: f8863d2
Author: Aravindan Vijayan 
Authored: Mon Feb 13 17:50:22 2017 -0800
Committer: Aravindan Vijayan 
Committed: Mon Feb 13 17:50:22 2017 -0800

--
 .../package/templates/hadoop-metrics2-hivemetastore.properties.j2   | 1 +
 .../package/templates/hadoop-metrics2-hiveserver2.properties.j2 | 1 +
 .../HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 | 1 +
 .../package/templates/hadoop-metrics2-llaptaskscheduler.j2  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/809453d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
index d2e43e9..82f71c5 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2
@@ -50,6 +50,7 @@
 
   hivemetastore.sink.timeline.collector.hosts={{ams_collector_hosts}}
   hivemetastore.sink.timeline.port={{metric_collector_port}}
+  hivemetastore.sink.timeline.protocol={{metric_collector_protocol}}
 
 
 {% endif %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/809453d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
index ed89679..f1bfa03 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2
@@ -50,5 +50,6 @@
 
   hiveserver2.sink.timeline.collector.hosts={{ams_collector_hosts}}
   hiveserver2.sink.timeline.port={{metric_collector_port}}
+  hiveserver2.sink.timeline.protocol={{metric_collector_protocol}}
 
 {% endif %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/809453d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
index 6b609dd..d63dfb7 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2
@@ -49,5 +49,6 @@
 
   llapdaemon.sink.timeline.collector.hosts={{ams_collector_hosts}}
   llapdaemon.sink.timeline.port={{metric_collector_port}}
+  llapdaemon.sink.timeline.protocol={{metric_collector_protocol}}
 
 {% endif %}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/809453d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2
index c229b75..4c9c981 100644
--- 

ambari git commit: AMBARI-19930. The service check status was set to TIMEOUT even if service check was failed. (mpapirkovskyy)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 8fdc2b0ec -> f8863d26b


AMBARI-19930. The service check status was set to TIMEOUT even if service check 
was failed. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8863d26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8863d26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8863d26

Branch: refs/heads/branch-2.5
Commit: f8863d26be527c97d8884ae663c125802ec0
Parents: 8fdc2b0
Author: Myroslav Papirkovskyi 
Authored: Thu Feb 9 20:11:26 2017 +0200
Committer: Sumit Mohanty 
Committed: Mon Feb 13 16:31:15 2017 -0800

--
 .../server/actionmanager/ActionScheduler.java   | 38 ++---
 .../actionmanager/TestActionScheduler.java  | 56 
 2 files changed, 54 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f8863d26/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index edf182e..680c0a6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -845,6 +845,28 @@ class ActionScheduler implements Runnable {
 commandsToSchedule.add(c);
 LOG.trace("===> commandsToSchedule(reschedule)=" + 
commandsToSchedule.size());
   }
+} else if (isHostStateUnknown(s, hostObj, roleStr)) {
+  String message = "Action was aborted due agent is not heartbeating 
or was restarted.";
+  LOG.warn("Host: {}, role: {}, actionId: {} . {}", host, roleStr,
+s.getActionId(), message);
+
+  db.abortHostRole(host, s.getRequestId(), s.getStageId(), 
c.getRole(), message);
+
+  if (null != cluster) {
+if (!RoleCommand.CUSTOM_COMMAND.equals(c.getRoleCommand())
+  && !RoleCommand.SERVICE_CHECK.equals(c.getRoleCommand())
+  && !RoleCommand.ACTIONEXECUTE.equals(c.getRoleCommand())) {
+  //commands above don't affect host component state (e.g. no 
in_progress state in process), transition will fail
+  transitionToFailedState(cluster.getClusterName(), 
c.getServiceName(), roleStr, host, now, false);
+}
+if (c.getRoleCommand().equals(RoleCommand.ACTIONEXECUTE)) {
+  processActionDeath(cluster.getClusterName(), c.getHostname(), 
roleStr);
+}
+  }
+
+  // Dequeue command
+  LOG.info("Removing command from queue, host={}, commandId={} ", 
host, c.getCommandId());
+  actionQueue.dequeue(host, c.getCommandId());
 } else if (status.equals(HostRoleStatus.PENDING)) {
   // in case of DEPENDENCY_ORDERED stage command can be scheduled only 
if all of it's dependencies are
   // already finished
@@ -1031,13 +1053,6 @@ class ActionScheduler implements Runnable {
   return false;
 }
 
-// Fast fail task if host state is unknown
-if (null != host &&
-  (host.getState().equals(HostState.HEARTBEAT_LOST) || 
wasAgentRestartedDuringOperation(host, stage, role))) {
-  LOG.debug("Timing out action since agent is not heartbeating or agent 
was restarted.");
-  return true;
-}
-
 // tasks are held in a variety of in-memory maps that require a hostname 
key
 // host being null is ok - that means it's a server-side task
 String hostName = (null == host) ? null : host.getHostName();
@@ -1054,6 +1069,15 @@ class ActionScheduler implements Runnable {
 return false;
   }
 
+  private boolean isHostStateUnknown(Stage stage, Host host, String role) {
+if (null != host &&
+  (host.getState().equals(HostState.HEARTBEAT_LOST) || 
wasAgentRestartedDuringOperation(host, stage, role))) {
+  LOG.debug("Abort action since agent is not heartbeating or agent was 
restarted.");
+  return true;
+}
+return false;
+  }
+
   private boolean hasCommandInProgress(Stage stage, String host) {
 List commandWrappers = 
stage.getExecutionCommands(host);
 for (ExecutionCommandWrapper wrapper : commandWrappers) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8863d26/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
--
diff --git 

ambari git commit: Revert "AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)"

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b0af5f741 -> 8fdc2b0ec


Revert "AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)"

This reverts commit 692bf97591a3538421720409bc3253451b8d8e0e.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fdc2b0e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fdc2b0e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fdc2b0e

Branch: refs/heads/branch-2.5
Commit: 8fdc2b0ec32d3559887214043a918fce16124273
Parents: b0af5f7
Author: Yusaku Sako 
Authored: Mon Feb 13 15:43:54 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Feb 13 15:44:00 2017 -0800

--
 .../resources/ui/app/components/create-table.js |  6 +---
 .../resources/ui/app/configs/file-format.js |  4 +--
 .../resources/ui/app/controllers/messages.js| 30 
 .../ui/app/controllers/messages/message.js  | 31 
 .../app/helpers/alert-message-context-class.js  | 27 --
 .../ui/app/helpers/alert-message-icon-class.js  | 37 
 .../resources/ui/app/helpers/shorten-text.js| 32 -
 .../main/resources/ui/app/mixins/ui-logger.js   | 15 
 .../main/resources/ui/app/routes/databases.js   | 12 +++
 .../databases/database/tables/new-database.js   | 15 
 .../app/routes/databases/database/tables/new.js |  8 ++---
 .../routes/databases/database/tables/table.js   |  8 ++---
 .../databases/database/tables/table/edit.js | 16 +
 .../databases/database/tables/table/rename.js   | 15 
 .../src/main/resources/ui/app/routes/jobs.js|  3 ++
 .../main/resources/ui/app/routes/settings.js| 10 +++---
 .../resources/ui/app/services/alert-messages.js | 13 +++
 .../ui/app/templates/databases-loading.hbs  | 21 ---
 .../databases/database/tables-loading.hbs   | 24 -
 .../databases/database/tables/table-loading.hbs | 21 ---
 .../resources/ui/app/templates/jobs-loading.hbs | 20 ---
 .../resources/ui/app/templates/messages.hbs | 14 +---
 .../ui/app/templates/messages/message.hbs   |  6 ++--
 .../ui/app/templates/savedqueries-loading.hbs   | 21 ---
 .../ui/app/templates/settings-loading.hbs   | 21 ---
 .../resources/ui/app/templates/udfs-loading.hbs | 21 ---
 .../src/main/resources/ui/config/environment.js |  2 +-
 27 files changed, 66 insertions(+), 387 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8fdc2b0e/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
index 670ebd7..f31d37f 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
@@ -18,17 +18,13 @@
 
 import Ember from 'ember';
 import Helper from '../configs/helpers';
-import FileFormats from '../configs/file-format';
 
 export default Ember.Component.extend({
   init() {
 this._super(...arguments);
-let defaultFileFormat = FileFormats.findBy('default', true);
 this.set('columns', Ember.A());
 this.set('properties', []);
-this.set('settings', {
-  fileFormat: { type: defaultFileFormat.name}
-});
+this.set('settings', {});
 this.set('shouldAddBuckets', null);
 this.set('settingErrors', []);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/8fdc2b0e/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js 
b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
index afcba6e..4042b63 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-let fileFormats = [
+export default [
   {name: "SEQUENCEFILE", default: false, custom: false},
   {name: "TEXTFILE", default: false, custom: false},
   {name: "RCFILE", default: false, custom: false},
@@ -24,5 +24,3 @@ let fileFormats = [
   {name: "AVRO", default: false, custom: false},
   {name: "CUSTOM SerDe", default: false, custom: true},
 ];
-
-export default fileFormats;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8fdc2b0e/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js

ambari git commit: Revert "AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)"

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4deacdd7b -> b31bef74c


Revert "AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)"

This reverts commit 6c4cbc4f7efddd55e063dbff470fa04eee2e68bf.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b31bef74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b31bef74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b31bef74

Branch: refs/heads/trunk
Commit: b31bef74c7a1bf1407eb0f5b5c77c62c4a7d0704
Parents: 4deacdd
Author: Yusaku Sako 
Authored: Mon Feb 13 15:44:31 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Feb 13 15:44:31 2017 -0800

--
 .../resources/ui/app/components/create-table.js |  6 +---
 .../resources/ui/app/configs/file-format.js |  4 +--
 .../resources/ui/app/controllers/messages.js| 30 
 .../ui/app/controllers/messages/message.js  | 31 
 .../app/helpers/alert-message-context-class.js  | 27 --
 .../ui/app/helpers/alert-message-icon-class.js  | 37 
 .../resources/ui/app/helpers/shorten-text.js| 32 -
 .../main/resources/ui/app/mixins/ui-logger.js   | 15 
 .../main/resources/ui/app/routes/databases.js   | 12 +++
 .../databases/database/tables/new-database.js   | 15 
 .../app/routes/databases/database/tables/new.js |  8 ++---
 .../routes/databases/database/tables/table.js   |  8 ++---
 .../databases/database/tables/table/edit.js | 16 +
 .../databases/database/tables/table/rename.js   | 15 
 .../src/main/resources/ui/app/routes/jobs.js|  3 ++
 .../main/resources/ui/app/routes/settings.js| 10 +++---
 .../resources/ui/app/services/alert-messages.js | 13 +++
 .../ui/app/templates/databases-loading.hbs  | 21 ---
 .../databases/database/tables-loading.hbs   | 24 -
 .../databases/database/tables/table-loading.hbs | 21 ---
 .../resources/ui/app/templates/jobs-loading.hbs | 20 ---
 .../resources/ui/app/templates/messages.hbs | 14 +---
 .../ui/app/templates/messages/message.hbs   |  6 ++--
 .../ui/app/templates/savedqueries-loading.hbs   | 21 ---
 .../ui/app/templates/settings-loading.hbs   | 21 ---
 .../resources/ui/app/templates/udfs-loading.hbs | 21 ---
 .../src/main/resources/ui/config/environment.js |  2 +-
 27 files changed, 66 insertions(+), 387 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b31bef74/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
index 670ebd7..f31d37f 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
@@ -18,17 +18,13 @@
 
 import Ember from 'ember';
 import Helper from '../configs/helpers';
-import FileFormats from '../configs/file-format';
 
 export default Ember.Component.extend({
   init() {
 this._super(...arguments);
-let defaultFileFormat = FileFormats.findBy('default', true);
 this.set('columns', Ember.A());
 this.set('properties', []);
-this.set('settings', {
-  fileFormat: { type: defaultFileFormat.name}
-});
+this.set('settings', {});
 this.set('shouldAddBuckets', null);
 this.set('settingErrors', []);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/b31bef74/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js 
b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
index afcba6e..4042b63 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-let fileFormats = [
+export default [
   {name: "SEQUENCEFILE", default: false, custom: false},
   {name: "TEXTFILE", default: false, custom: false},
   {name: "RCFILE", default: false, custom: false},
@@ -24,5 +24,3 @@ let fileFormats = [
   {name: "AVRO", default: false, custom: false},
   {name: "CUSTOM SerDe", default: false, custom: true},
 ];
-
-export default fileFormats;

http://git-wip-us.apache.org/repos/asf/ambari/blob/b31bef74/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js
--
diff 

ambari git commit: AMBARI-19972. Stop All services call failed to stop flume agent.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7cb9a6ad5 -> 4deacdd7b


AMBARI-19972. Stop All services call failed to stop flume agent.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4deacdd7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4deacdd7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4deacdd7

Branch: refs/heads/trunk
Commit: 4deacdd7ba81ba4348d1929c09a66858dbd5ba6c
Parents: 7cb9a6a
Author: Vitaly Brodetskyi 
Authored: Tue Feb 14 00:57:40 2017 +0200
Committer: Vitaly Brodetskyi 
Committed: Tue Feb 14 00:57:40 2017 +0200

--
 .../common-services/FLUME/1.4.0.2.0/package/scripts/flume.py | 4 +++-
 ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4deacdd7/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index aeb7074..e1d1874 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -228,8 +228,10 @@ def flume(action = None):
   if is_flume_process_live(pid_file):
 pid = shell.checked_call(("cat", pid_file), sudo=True)[1].strip()
 Execute(("kill", "-15", pid), sudo=True)# kill command has to be a 
tuple
+if not await_flume_process_termination(pid_file, try_count=30):
+  Execute(("kill", "-9", pid), sudo=True)
   
-  if not await_flume_process_termination(pid_file):
+  if not await_flume_process_termination(pid_file, try_count=10):
 show_logs(params.flume_log_dir, None)
 raise Fail("Can't stop flume agent: {0}".format(agent))
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4deacdd7/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py 
b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
index 4cf43c1..02810e2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
@@ -122,7 +122,7 @@ class TestFlumeHandler(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
 
 self.assertTrue(glob_mock.called)
-
await_flume_process_termination_mock.assert_called_with('/var/run/flume/a1.pid')
+
await_flume_process_termination_mock.assert_called_with('/var/run/flume/a1.pid',
 try_count=10)
 
 self.assertTrue(set_desired_mock.called)
 self.assertTrue(set_desired_mock.call_args[0][0] == 'INSTALLED')
@@ -421,7 +421,7 @@ class TestFlumeHandler(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
 
 self.assertTrue(glob_mock.called)
-
await_flume_process_termination_mock.assert_called_with('/var/run/flume/b1.pid')
+
await_flume_process_termination_mock.assert_called_with('/var/run/flume/b1.pid',
 try_count=10)
 
 self.assertResourceCalled('File', '/var/run/flume/b1.pid', action = 
['delete'])
 

ambari git commit: AMBARI-19972. Stop All services call failed to stop flume agent.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ff4c849ad -> b0af5f741


AMBARI-19972. Stop All services call failed to stop flume agent.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0af5f74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0af5f74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0af5f74

Branch: refs/heads/branch-2.5
Commit: b0af5f74181e9704eb9bf7fe8e897859885866ca
Parents: ff4c849
Author: Vitaly Brodetskyi 
Authored: Tue Feb 14 00:55:24 2017 +0200
Committer: Vitaly Brodetskyi 
Committed: Tue Feb 14 00:55:24 2017 +0200

--
 .../common-services/FLUME/1.4.0.2.0/package/scripts/flume.py | 4 +++-
 ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0af5f74/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index 81b077f..7fff26e 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -220,8 +220,10 @@ def flume(action = None):
   if is_flume_process_live(pid_file):
 pid = shell.checked_call(("cat", pid_file), sudo=True)[1].strip()
 Execute(("kill", "-15", pid), sudo=True)# kill command has to be a 
tuple
+if not await_flume_process_termination(pid_file, try_count=30):
+  Execute(("kill", "-9", pid), sudo=True)
   
-  if not await_flume_process_termination(pid_file):
+  if not await_flume_process_termination(pid_file, try_count=10):
 show_logs(params.flume_log_dir, None)
 raise Fail("Can't stop flume agent: {0}".format(agent))
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0af5f74/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py 
b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
index 4cf43c1..02810e2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
@@ -122,7 +122,7 @@ class TestFlumeHandler(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
 
 self.assertTrue(glob_mock.called)
-
await_flume_process_termination_mock.assert_called_with('/var/run/flume/a1.pid')
+
await_flume_process_termination_mock.assert_called_with('/var/run/flume/a1.pid',
 try_count=10)
 
 self.assertTrue(set_desired_mock.called)
 self.assertTrue(set_desired_mock.call_args[0][0] == 'INSTALLED')
@@ -421,7 +421,7 @@ class TestFlumeHandler(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
 
 self.assertTrue(glob_mock.called)
-
await_flume_process_termination_mock.assert_called_with('/var/run/flume/b1.pid')
+
await_flume_process_termination_mock.assert_called_with('/var/run/flume/b1.pid',
 try_count=10)
 
 self.assertResourceCalled('File', '/var/run/flume/b1.pid', action = 
['delete'])
 

[43/50] [abbrv] ambari git commit: AMBARI-19944 Increase SNMP Unit Test Coverage (dsen)

[ncole]

AMBARI-19944 Increase SNMP Unit Test Coverage (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b8176ff6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b8176ff6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b8176ff6

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b8176ff63c00115156062a2af9d2e2cae164e514
Parents: a906061
Author: Dmytro Sen 
Authored: Mon Feb 13 12:42:06 2017 +0200
Committer: Dmytro Sen 
Committed: Mon Feb 13 12:42:06 2017 +0200

--
 .../AlertNoticeDispatchServiceTest.java | 159 ++-
 1 file changed, 152 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b8176ff6/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
index 07094a8..8423eaf 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
@@ -24,13 +24,16 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.EnumSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.Vector;
 import java.util.concurrent.Executor;
 
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -38,6 +41,7 @@ import org.apache.ambari.server.notifications.DispatchFactory;
 import org.apache.ambari.server.notifications.Notification;
 import org.apache.ambari.server.notifications.NotificationDispatcher;
 import org.apache.ambari.server.notifications.TargetConfigurationResult;
+import org.apache.ambari.server.notifications.dispatchers.AmbariSNMPDispatcher;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
 import org.apache.ambari.server.orm.dao.AlertDispatchDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
@@ -48,10 +52,24 @@ import org.apache.ambari.server.state.AlertState;
 import org.apache.ambari.server.state.NotificationState;
 import org.apache.ambari.server.state.alert.Scope;
 import org.apache.ambari.server.state.alert.SourceType;
+import org.apache.ambari.server.state.alert.TargetType;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.snmp4j.CommandResponder;
+import org.snmp4j.CommandResponderEvent;
+import org.snmp4j.PDU;
+import org.snmp4j.Snmp;
+import org.snmp4j.TransportMapping;
+import org.snmp4j.mp.SnmpConstants;
+import org.snmp4j.smi.Address;
+import org.snmp4j.smi.GenericAddress;
+import org.snmp4j.smi.Integer32;
+import org.snmp4j.smi.OID;
+import org.snmp4j.smi.OctetString;
+import org.snmp4j.smi.VariableBinding;
+import org.snmp4j.transport.DefaultUdpTransportMapping;
 
 import com.google.inject.Binder;
 import com.google.inject.Guice;
@@ -240,10 +258,10 @@ public class AlertNoticeDispatchServiceTest extends 
AlertNoticeDispatchService {
* @throws Exception
*/
   @Test
-  public void testSingleDispatch() throws Exception {
+  public void testSingleSnmpDispatch() throws Exception {
 MockSnmpDispatcher dispatcher = new MockSnmpDispatcher();
 
-List notices = getSnmpMockNotices();
+List notices = getSnmpMockNotices("SNMP");
 AlertNoticeEntity notice1 = notices.get(0);
 AlertNoticeEntity notice2 = notices.get(1);
 
@@ -269,6 +287,105 @@ public class AlertNoticeDispatchServiceTest extends 
AlertNoticeDispatchService {
   }
 
   /**
+   * Tests a digest dispatch for Ambari SNMP.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testAmbariSnmpSingleDispatch() throws Exception {
+MockAmbariSnmpDispatcher dispatcher = new MockAmbariSnmpDispatcher();
+
+List notices = getSnmpMockNotices("AMBARI_SNMP");
+AlertNoticeEntity notice1 = notices.get(0);
+AlertNoticeEntity notice2 = notices.get(1);
+
+EasyMock.expect(m_dao.findPendingNotices()).andReturn(notices).once();
+EasyMock.expect(m_dao.merge(notice1)).andReturn(notice1).once();
+EasyMock.expect(m_dao.merge(notice2)).andReturn(notice2).once();
+
EasyMock.expect(m_dispatchFactory.getDispatcher("AMBARI_SNMP")).andReturn(dispatcher).atLeastOnce();
+
+EasyMock.replay(m_dao, m_dispatchFactory);
+
+ 

[17/50] [abbrv] ambari git commit: AMBARI-19947. To make sure LLAP preemption happens correctly, should enable priority-utilization.underutilized-preemption.enabled=true when YARN preemption is enable

[ncole]

AMBARI-19947. To make sure LLAP preemption happens correctly, should enable 
priority-utilization.underutilized-preemption.enabled=true when YARN preemption 
is enabled.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59545f7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59545f7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59545f7f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 59545f7fde971c352c7f7f44a19f436887fcdfe7
Parents: b15b606
Author: Vitaly Brodetskyi 
Authored: Fri Feb 10 14:41:12 2017 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Feb 10 14:41:12 2017 +0200

--
 .../YARN/3.0.0.3.0/service_advisor.py| 15 ++-
 .../2.6/services/YARN/configuration/yarn-site.xml| 12 
 .../stacks/HDP/2.6/services/stack_advisor.py | 12 
 .../3.0/services/YARN/configuration/yarn-site.xml| 13 +
 4 files changed, 51 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/59545f7f/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
index 30dd474..aecf1e3 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
@@ -130,6 +130,7 @@ class YARNServiceAdvisor(service_advisor.ServiceAdvisor):
 recommender.recommendYARNConfigurationsFromHDP22(configurations, 
clusterData, services, hosts)
 recommender.recommendYARNConfigurationsFromHDP23(configurations, 
clusterData, services, hosts)
 recommender.recommendYARNConfigurationsFromHDP25(configurations, 
clusterData, services, hosts)
+recommender.recommendYARNConfigurationsFromHDP26(configurations, 
clusterData, services, hosts)
 
   def getServiceConfigurationsValidationItems(self, configurations, 
recommendedDefaults, services, hosts):
 """
@@ -435,6 +436,18 @@ class YARNRecommender(service_advisor.ServiceAdvisor):
 
putYarnSiteProperty('yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes',
 ",".join(timeline_plugin_classes_values))
 
putYarnSiteProperty('yarn.timeline-service.entity-group-fs-store.group-id-plugin-classpath',
 ":".join(timeline_plugin_classpath_values))
 
+
+  def recommendYARNConfigurationsFromHDP26(self, configurations, clusterData, 
services, hosts):
+putYarnSiteProperty = self.putProperty(configurations, "yarn-site", 
services)
+
+if "yarn-site" in services["configurations"] and \
+"yarn.resourcemanager.scheduler.monitor.enable" in 
services["configurations"]["yarn-site"]["properties"]:
+  scheduler_monitor_enabled = 
services["configurations"]["yarn-site"]["properties"]["yarn.resourcemanager.scheduler.monitor.enable"]
+  if scheduler_monitor_enabled.lower() == 'true':
+
putYarnSiteProperty('yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled',
 "true")
+  else:
+
putYarnSiteProperty('yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled',
 "false")
+
   #region LLAP
   def updateLlapConfigs(self, configurations, services, hosts, 
llap_queue_name):
 """
@@ -1787,4 +1800,4 @@ class MAPREDUCE2Validator(service_advisor.ServiceAdvisor):
   if yarnAppMapreduceAmCommandOpts > yarnAppMapreduceAmResourceMb:
 validationItems.append({"config-name": 
'yarn.app.mapreduce.am.command-opts', "item": 
self.getWarnItem("yarn.app.mapreduce.am.command-opts Xmx should be less than 
yarn.app.mapreduce.am.resource.mb ({0})".format(yarnAppMapreduceAmResourceMb))})
 
-return self.toConfigurationValidationProblems(validationItems, 
"mapred-site")
\ No newline at end of file
+return self.toConfigurationValidationProblems(validationItems, 
"mapred-site")

http://git-wip-us.apache.org/repos/asf/ambari/blob/59545f7f/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
index 58b528e..70a2cbe 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
+++ 

[27/50] [abbrv] ambari git commit: AMBARI-19357. Flume metrics can't show if hostname of flume agent is not lowercase. (Yao Lei via swagle)

[ncole]

AMBARI-19357. Flume metrics can't show if hostname of flume agent  is not 
lowercase. (Yao Lei via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/38a17a7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/38a17a7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/38a17a7f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 38a17a7fb4a27c7ab2bd3d4e87d8ffd0f4150079
Parents: 4381561
Author: Siddharth Wagle 
Authored: Fri Feb 10 13:31:39 2017 -0800
Committer: Siddharth Wagle 
Committed: Fri Feb 10 13:31:39 2017 -0800

--
 .../hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/38a17a7f/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
index 86e092a..3fdf3f4 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
@@ -88,6 +88,8 @@ public class FlumeTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
   if ((hostname == null) || (!hostname.contains("."))) {
 hostname = InetAddress.getLocalHost().getCanonicalHostName();
   }
+  hostname = hostname.toLowerCase();
+
 } catch (UnknownHostException e) {
   LOG.error("Could not identify hostname.");
   throw new FlumeException("Could not identify hostname.", e);

[04/50] [abbrv] ambari git commit: AMBARI-19758 : Post Ambari upgrade AMS config properties changes are marking HDFS/YARN/Hive/HBase with restart required. (avijayan)

[ncole]

AMBARI-19758 : Post Ambari upgrade AMS config properties changes are marking 
HDFS/YARN/Hive/HBase with restart required. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05ce603a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05ce603a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05ce603a

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 05ce603a9fa5a6a72af4de70cbc21208f6749384
Parents: 7abf4e6
Author: Aravindan Vijayan 
Authored: Thu Feb 9 13:45:57 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Feb 9 13:45:57 2017 -0800

--
 .../hadoop-metrics2.properties.xml  | 125 ---
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |   1 -
 .../2.0.6/hooks/before-START/scripts/params.py  |   4 +-
 .../scripts/shared_initialization.py|  17 ++-
 .../hadoop-metrics2.properties.xml  | 125 +++
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |   3 +
 .../PERF/1.0/services/FAKEHDFS/metainfo.xml |   1 -
 7 files changed, 143 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/05ce603a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-metrics2.properties.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-metrics2.properties.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-metrics2.properties.xml
deleted file mode 100644
index 6b45e84..000
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-metrics2.properties.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-  
-  
-content
-hadoop-metrics2.properties template
-This is the jinja template for hadoop-metrics2.properties 
file
-
-# 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.
-
-# syntax: [prefix].[source|sink|jmx].[instance].[options]
-# See package.html for org.apache.hadoop.metrics2 for details
-
-{% if has_ganglia_server %}
-*.period=60
-
-*.sink.ganglia.class=org.apache.hadoop.metrics2.sink.ganglia.GangliaSink31
-*.sink.ganglia.period=10
-
-# default for supportsparse is false
-*.sink.ganglia.supportsparse=true
-
-.sink.ganglia.slope=jvm.metrics.gcCount=zero,jvm.metrics.memHeapUsedM=both
-.sink.ganglia.dmax=jvm.metrics.threadsBlocked=70,jvm.metrics.memHeapUsedM=40
-
-# Hook up to the server
-namenode.sink.ganglia.servers={{ganglia_server_host}}:8661
-datanode.sink.ganglia.servers={{ganglia_server_host}}:8659
-jobtracker.sink.ganglia.servers={{ganglia_server_host}}:8662
-tasktracker.sink.ganglia.servers={{ganglia_server_host}}:8658
-maptask.sink.ganglia.servers={{ganglia_server_host}}:8660
-reducetask.sink.ganglia.servers={{ganglia_server_host}}:8660
-resourcemanager.sink.ganglia.servers={{ganglia_server_host}}:8664
-nodemanager.sink.ganglia.servers={{ganglia_server_host}}:8657
-historyserver.sink.ganglia.servers={{ganglia_server_host}}:8666
-journalnode.sink.ganglia.servers={{ganglia_server_host}}:8654
-nimbus.sink.ganglia.servers={{ganglia_server_host}}:8649
-supervisor.sink.ganglia.servers={{ganglia_server_host}}:8650
-
-resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue
-
-{% endif %}
-
-{% if has_metric_collector %}
-
-*.period={{metrics_collection_period}}
-*.sink.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
-*.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-*.sink.timeline.period={{metrics_collection_period}}
-*.sink.timeline.sendInterval={{metrics_report_interval}}000
-*.sink.timeline.slave.host.name={{hostname}}
-*.sink.timeline.zookeeper.quorum={{zookeeper_quorum}}
-*.sink.timeline.protocol={{metric_collector_protocol}}
-*.sink.timeline.port={{metric_collector_port}}
-
-# HTTPS properties
-*.sink.timeline.truststore.path = {{metric_truststore_path}}
-*.sink.timeline.truststore.type = 

[07/50] [abbrv] ambari git commit: AMBARI-19928. Solr grafana dashboards. (Willy Solaligue via yusaku)

[ncole]

AMBARI-19928. Solr grafana dashboards. (Willy Solaligue via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00ed4159
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00ed4159
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00ed4159

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 00ed41594fdd03c7da715904efec522748c1e3bd
Parents: 05ce603
Author: Yusaku Sako 
Authored: Thu Feb 9 16:49:03 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 9 16:49:03 2017 -0800

--
 .../HDP/grafana-solr-cores-dashboard.json   | 3162 ++
 .../HDP/grafana-solr-hosts-dashboard.json   |  538 +++
 2 files changed, 3700 insertions(+)
--

[34/50] [abbrv] ambari git commit: AMBARI-19931. HiveView2.0: DB panel shows up on Query result full screen (pallavkul)

[ncole]

AMBARI-19931. HiveView2.0: DB panel shows up on Query result full screen 
(pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77b5b16e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77b5b16e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77b5b16e

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 77b5b16e2bd68ed18e193104b56ad0bb434ee505
Parents: 1d1253a
Author: pallavkul 
Authored: Sat Feb 11 17:17:12 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 17:17:12 2017 +0530

--
 .../resources/ui/app/routes/queries/query.js| 43 +---
 .../src/main/resources/ui/app/services/query.js |  2 -
 .../src/main/resources/ui/app/styles/app.scss   |  1 -
 .../ui/app/templates/queries/query.hbs  |  4 +-
 4 files changed, 40 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 72682f5..88202ff 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -24,6 +24,9 @@ export default Ember.Route.extend({
   jobs: Ember.inject.service(),
   savedQueries: Ember.inject.service(),
 
+  isQueryEdidorPaneExpanded: false,
+  isQueryResultPanelExpanded: false,
+
   beforeModel(){
 let existingWorksheets = this.store.peekAll('worksheet');
 existingWorksheets.setEach('selected', false);
@@ -161,7 +164,6 @@ export default Ember.Route.extend({
   this.get('controller.model').set('selectedDb', db);
 },
 
-
 visualExplainQuery(){
   this.get('controller').set('isVisualExplainQuery', true );
   this.send('executeQuery');
@@ -389,15 +391,46 @@ export default Ember.Route.extend({
 },
 
 expandQueryEdidorPanel(){
+
+  if(!this.get('isQueryEdidorPaneExpanded')){
+this.set('isQueryEdidorPaneExpanded', true);
+  } else {
+this.set('isQueryEdidorPaneExpanded', false);
+  }
   Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
   Ember.$('.database-panel').toggleClass("hide");
+
 },
 
 expandQueryResultPanel(){
-  Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
-  Ember.$('.query-editor-container').toggleClass("hide");
-  Ember.$('.database-panel').toggleClass("hide");
-  this.send('adjustPanelSize');
+
+  if(!this.get('isQueryResultPanelExpanded')){
+
+if(!this.get('isQueryEdidorPaneExpanded')){
+  Ember.$('.query-editor-container').addClass("hide");
+  Ember.$('.database-panel').addClass("hide");
+  Ember.$('.query-editor-panel').addClass('query-editor-full-width');
+} else {
+
+  Ember.$('.query-editor-container').addClass("hide");
+}
+this.set('isQueryResultPanelExpanded', true);
+
+  } else {
+
+if(!this.get('isQueryEdidorPaneExpanded')){
+  Ember.$('.query-editor-container').removeClass("hide");
+  Ember.$('.database-panel').removeClass("hide");
+  
Ember.$('.query-editor-panel').removeClass('query-editor-full-width');
+} else {
+
+  Ember.$('.query-editor-container').removeClass("hide");
+
+}
+this.set('isQueryResultPanelExpanded', false);
+
+  }
+
 },
 
 adjustPanelSize(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/services/query.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/services/query.js
index b484c74..42d4fb0 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/services/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/services/query.js
@@ -80,6 +80,4 @@ export default Ember.Service.extend({
 });
   }
 
-
-
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index 6469b2e..a9c91c7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -322,7 +322,6 @@ pre {
 }
 
 

[30/50] [abbrv] ambari git commit: AMBARI-19577. Add Livy session recovery configurations in Ambari - fix merge issue (Saisai Shao via smohanty)

[ncole]

AMBARI-19577. Add Livy session recovery configurations in Ambari - fix merge 
issue (Saisai Shao via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b00cf74f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b00cf74f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b00cf74f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b00cf74f6cecb984381eeed9e464ad1db6461a18
Parents: e7d0e78
Author: Sumit Mohanty 
Authored: Fri Feb 10 16:53:45 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Feb 10 16:53:45 2017 -0800

--
 .../stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b00cf74f/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml
index c8a65bd..c21a5e6 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml
@@ -85,8 +85,8 @@
 Whether to enable HiveContext in livy interpreter
 
 
-
 
+
 livy.server.recovery.mode
 recovery
 

[48/50] [abbrv] ambari git commit: AMBARI-19987 Oozie start failed after enabling credential store (dsen)

[ncole]

AMBARI-19987 Oozie start failed after enabling credential store (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d252665c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d252665c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d252665c

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d252665ce94f532b08efb9bc5f31f7b8f6cde97a
Parents: fa32fec
Author: Dmytro Sen 
Authored: Mon Feb 13 19:42:59 2017 +0200
Committer: Dmytro Sen 
Committed: Mon Feb 13 19:42:59 2017 +0200

--
 .../ambari_agent/CustomServiceOrchestrator.py   | 12 +-
 .../ambari_commons/credential_store_helper.py   | 45 
 .../query/render/ClusterBlueprintRenderer.java  |  8 ++--
 .../internal/ServiceResourceProvider.java   |  1 -
 .../orm/entities/ServiceDesiredStateEntity.java | 21 -
 .../org/apache/ambari/server/state/Service.java |  8 
 .../apache/ambari/server/state/ServiceImpl.java | 40 +++--
 .../server/upgrade/UpgradeCatalog250.java   |  5 ---
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../0.12.0.2.0/package/scripts/params_linux.py  | 35 +++
 .../4.0.0.2.0/package/scripts/params_linux.py   | 20 -
 .../server/upgrade/UpgradeCatalog250Test.java   | 12 +-
 17 files changed, 90 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d252665c/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index bacda46..9f2852b 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -238,6 +238,7 @@ class CustomServiceOrchestrator():
 value_names.append(value_name) # Gather the value_name for 
deletion
   if len(credentials) > 0:
 configtype_credentials[config_type] = credentials
+logger.info("Identifying config {0} for CS: ".format(config_type))
   for value_name in value_names:
 # Remove the clear text password
 config.pop(value_name, None)
@@ -255,8 +256,11 @@ class CustomServiceOrchestrator():
 roleCommand = None
 if 'roleCommand' in commandJson:
   roleCommand = commandJson['roleCommand']
+task_id = None
+if 'taskId' in commandJson:
+  task_id = commandJson['taskId']
 
-logger.info('generateJceks: roleCommand={0}'.format(roleCommand))
+logger.info('Generating the JCEKS file: roleCommand={0} and taskId = 
{1}'.format(roleCommand, task_id))
 
 # Set up the variables for the external command to generate a JCEKS file
 java_home = commandJson['hostLevelParams']['java_home']
@@ -267,6 +271,12 @@ class CustomServiceOrchestrator():
 
 # Gather the password values and remove them from the configuration
 configtype_credentials = self.getConfigTypeCredentials(commandJson)
+
+# CS is enabled but no config property is available for this command
+if len(configtype_credentials) == 0:
+  logger.info("Credential store is enabled but no property are found that 
can be encrypted.")
+  commandJson['credentialStoreEnabled'] = "false"
+
 for config_type, credentials in configtype_credentials.items():
   config = commandJson['configurations'][config_type]
   file_path = os.path.join(self.getProviderDirectory(serviceName), 
"{0}.jceks".format(config_type))

http://git-wip-us.apache.org/repos/asf/ambari/blob/d252665c/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
--
diff --git 
a/ambari-common/src/main/python/ambari_commons/credential_store_helper.py 
b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
new file mode 100644
index 000..914c1c7
--- /dev/null
+++ b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+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 

[36/50] [abbrv] ambari git commit: AMBARI-19968. Control Log Level for all Hive components for log4j (Madhuvanthi Radhakrishnan via smohanty)

[ncole]

AMBARI-19968. Control Log Level for all Hive components for log4j (Madhuvanthi 
Radhakrishnan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6e0b267
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6e0b267
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6e0b267

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d6e0b267a26ee5a1ca8a35b2cf682c860653eef8
Parents: 6098d34
Author: Sumit Mohanty 
Authored: Fri Feb 10 22:54:27 2017 -0800
Committer: Sumit Mohanty 
Committed: Sat Feb 11 08:23:46 2017 -0800

--
 .../ambari/server/state/theme/TabLayout.java|  17 ++-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py |   2 +-
 .../package/scripts/hive_interactive.py |   4 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   1 +
 .../HIVE/configuration/beeline-log4j2.xml   |   2 +-
 .../services/HIVE/configuration/hive-env.xml|  29 +
 .../HIVE/configuration/hive-exec-log4j.xml  | 114 +
 .../HIVE/configuration/hive-exec-log4j2.xml |   2 +-
 .../services/HIVE/configuration/hive-log4j.xml  | 126 +++
 .../services/HIVE/configuration/hive-log4j2.xml |   2 +-
 .../HIVE/configuration/llap-cli-log4j2.xml  |   2 +-
 .../HIVE/configuration/llap-daemon-log4j.xml|   2 +-
 .../HIVE/configuration/webhcat-log4j.xml|  83 
 .../HDP/2.5/services/HIVE/themes/theme.json |  48 +++
 .../stacks/2.0.6/HIVE/test_hive_client.py   |   4 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py|   6 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py   |   4 +-
 .../stacks/2.5/HIVE/test_hive_server_int.py |  10 +-
 18 files changed, 432 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
index 0e38040..4f6cf8f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
@@ -19,15 +19,16 @@
 package org.apache.ambari.server.state.theme;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -90,8 +91,12 @@ public class TabLayout {
 if (childSection.isRemoved()) {
   mergedSections.remove(childSection.getName());
 } else {
-  Section parentSection = mergedSections.get(childSection.getName());
-  childSection.mergeWithParent(parentSection);
+  if(mergedSections.containsKey(childSection.getName())) {
+Section parentSection = mergedSections.get(childSection.getName());
+childSection.mergeWithParent(parentSection);
+  }else{
+childSection.mergeWithParent(childSection);
+  }
   mergedSections.put(childSection.getName(), childSection);
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index 2a4fd30..b7b04a2 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -375,7 +375,7 @@ def fill_conf_dir(component_conf_dir):
mode=mode_identified_for_file,
group=params.user_group,
owner=params.hive_user,
-   content=params.log4j_exec_props
+   content=InlineTemplate(params.log4j_exec_props)
   )
 elif 
(os.path.exists("{component_conf_dir}/{log4j_exec_filename}.template")):
   File(format("{component_conf_dir}/{log4j_exec_filename}"),

[22/50] [abbrv] ambari git commit: AMBARI-19577. Add Livy session recovery configurations in Ambari (Saisai Shao via smohanty)

[ncole]

AMBARI-19577. Add Livy session recovery configurations in Ambari (Saisai Shao 
via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0ba7fbe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0ba7fbe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0ba7fbe

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: a0ba7fbe7f80332bcff1cab9ea7dbe27ca59a003
Parents: eecb5a3
Author: Sumit Mohanty 
Authored: Fri Feb 10 08:36:58 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Feb 10 08:42:42 2017 -0800

--
 .../SPARK/1.2.1/package/scripts/params.py   |  1 +
 .../SPARK/1.2.1/package/scripts/setup_livy.py   |  8 +
 .../SPARK2/2.0.0/package/scripts/params.py  |  1 +
 .../SPARK2/2.0.0/package/scripts/setup_livy2.py |  8 +
 .../services/SPARK/configuration/livy-conf.xml  | 24 +++
 .../SPARK2/configuration/livy2-conf.xml | 24 +++
 .../python/stacks/2.5/SPARK/test_spark_livy.py  | 31 
 .../stacks/2.6/SPARK2/test_spark_livy2.py   | 31 
 8 files changed, 128 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a0ba7fbe/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index 82cd0b2..6a59caf 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -222,6 +222,7 @@ if stack_version_formatted and 
check_stack_feature(StackFeature.SPARK_LIVY, stac
   user_group = status_params.user_group
   livy_hdfs_user_dir = format("/user/{livy_user}")
   livy_server_pid_file = status_params.livy_server_pid_file
+  livy_recovery_dir = 
default("/configurations/livy-conf/livy.server.recovery.state-store.url", 
"/livy-recovery")
 
   livy_server_start = format("{livy_home}/bin/livy-server start")
   livy_server_stop = format("{livy_home}/bin/livy-server stop")

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0ba7fbe/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_livy.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_livy.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_livy.py
index 07b704f..32615c3 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_livy.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_livy.py
@@ -40,6 +40,14 @@ def setup_livy(env, type, upgrade_type = None, action = 
None):
 )
 params.HdfsResource(None, action="execute")
 
+params.HdfsResource(params.livy_recovery_dir,
+   type="directory",
+   action="create_on_execute",
+   owner=params.livy_user,
+   mode=0775
+)
+params.HdfsResource(None, action="execute")
+
   # create livy-env.sh in etc/conf dir
   File(os.path.join(params.livy_conf, 'livy-env.sh'),
owner=params.livy_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0ba7fbe/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
index c19f88c..b6889e4 100755
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
@@ -207,6 +207,7 @@ if stack_version_formatted and 
check_stack_feature(StackFeature.SPARK_LIVY2, sta
   user_group = status_params.user_group
   livy2_hdfs_user_dir = format("/user/{livy2_user}")
   livy2_server_pid_file = status_params.livy2_server_pid_file
+  livy2_recovery_dir = 
default("/configurations/livy2-conf/livy.server.recovery.state-store.url", 
"/livy2-recovery")
 
   livy2_server_start = format("{livy2_home}/bin/livy-server start")
   livy2_server_stop = format("{livy2_home}/bin/livy-server stop")

[06/50] [abbrv] ambari git commit: AMBARI-19928. Solr grafana dashboards. (Willy Solaligue via yusaku)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/00ed4159/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json
new file mode 100644
index 000..4529092
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json
@@ -0,0 +1,3162 @@
+{
+  "id": null,
+  "title": "Solr - Cores",
+  "originalTitle": "Solr - Cores",
+  "tags": ["solr"],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Solr Cores Dashboard",
+  "editable": true,
+  "error": false,
+  "height": "25px",
+  "id": 2,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "Row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)",
+"thresholdLine": false
+  },
+  "height": "",
+  "id": 4,
+  "isNew": true,
+  "legend": {
+"alignAsTable": false,
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"rightSide": false,
+"show": true,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "none",
+  "alias": "adds",
+  "app": "solr-core-app",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "hosts": "",
+  "metric": "solr.admin.mbeans.updateHandler.adds",
+  "precision": "default",
+  "refId": "A",
+  "seriesAggregator": "none",
+  "templatedHost": "",
+  "transform": "none"
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Indexing Throughput",
+  "tooltip": {
+"shared": true,
+"value_type": "cumulative"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"none",
+"none"
+  ]
+},
+{
+  "aliasColors": {
+  },
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 5,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": true,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+   

[14/50] [abbrv] ambari git commit: AMBARI-19955 : added the is first row header functionality to upload table (nitirajrathore)

[ncole]

AMBARI-19955 : added the is first row header functionality to upload table 
(nitirajrathore)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7e11e9a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7e11e9a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7e11e9a

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d7e11e9abfde98618ff90f96b8a0952c30c6bef1
Parents: 97994e2
Author: Nitiraj Singh Rathore 
Authored: Fri Feb 10 16:15:59 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Fri Feb 10 16:17:49 2017 +0530

--
 .../ui/app/components/csv-format-params.js  |   1 -
 .../src/main/resources/ui/app/models/column.js  |   8 +-
 .../databases/database/tables/upload-table.js   | 199 +++
 .../ui/app/services/table-operations.js |   4 +-
 .../templates/components/csv-format-params.hbs  |  12 ++
 5 files changed, 49 insertions(+), 175 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e11e9a/contrib/views/hive20/src/main/resources/ui/app/components/csv-format-params.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/csv-format-params.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/csv-format-params.js
index 7a14ba8..5a8f00d 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/csv-format-params.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/csv-format-params.js
@@ -25,7 +25,6 @@ export default Ember.Component.extend({
   DEFAULT_CSV_QUOTE: '"',
   DEFAULT_CSV_ESCAPE: '\\',
   DEFAULT_FILE_TYPE: 'CSV',
-  isFirstRowHeader: false, // is first row  header
   csvParams: Ember.Object.create(),
   inputFileTypes: Ember.computed(function () {
 return Helpers.getUploadFileTypes();

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e11e9a/contrib/views/hive20/src/main/resources/ui/app/models/column.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/column.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/column.js
index f38309b..73a9824 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/column.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/column.js
@@ -90,9 +90,11 @@ let Column = Ember.Object.extend(Ember.Copyable,{
   } else if(this.get('type.hasScale') && this.get('scale') && 
(this.get('precision') < this.get('scale'))) {
 this.get('errors').pushObject({type: 'precision', error: "Precision 
can only be greater than scale"});
   }
-
+}else{
+  delete this.precision;
 }
 
+
 if(this.get('type.hasScale')) {
   if(Ember.isEmpty(this.get('scale'))) {
 this.get('errors').pushObject({type: 'scale', error: "Scale cannot be 
empty"});
@@ -101,8 +103,10 @@ let Column = Ember.Object.extend(Ember.Copyable,{
   } else if(this.get('scale') <= 0) {
 this.get('errors').pushObject({type: 'scale', error: "Scale can only 
be greater than zero"});
   }
-
+}else{
+  delete this.scale;
 }
+
 return this.get('errors.length') === 0;
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e11e9a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
index ba3260c..0e61905 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
@@ -21,44 +21,31 @@ import NewTable from './new';
 import constants from '../../../../utils/constants';
 import Column from '../../../../models/column';
 import datatypes from '../../../../configs/datatypes';
+import Helpers from '../../../../configs/helpers';
 
 export default NewTable.extend({
   COLUMN_NAME_REGEX: "^[a-zA-Z]{1}[a-zA-Z0-9_]*$",
   TABLE_NAME_REGEX: "^[a-zA-Z]{1}[a-zA-Z0-9_]*$",
   HDFS_PATH_REGEX: "^[/]{1}.+",  // unix path allows everything but here we 
have to mention full path so starts with /
-  init: function () {
-this._super();
-  },
-
-  COLUMN_NAME_PREFIX : "column",
-  i18n : Ember.inject.service('i18n'),
+  i18n : Ember.inject.service("i18n"),
   jobService: Ember.inject.service(constants.services.jobs),
   notifyService: Ember.inject.service(constants.services.alertMessages),
   showErrors: false,
-  baseUrl: 

[13/50] [abbrv] ambari git commit: AMBARI-19418. Support setup queue priority in Ambari - Capacity scheduler view. (Akhil PB via gauravn7)

[ncole]

AMBARI-19418. Support setup queue priority in Ambari - Capacity scheduler view. 
(Akhil PB via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97994e23
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97994e23
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97994e23

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 97994e23f3b6ec71ff9911e43d9c4b135487acba
Parents: 92cf561
Author: Gaurav Nagar 
Authored: Fri Feb 10 15:46:59 2017 +0530
Committer: Gaurav Nagar 
Committed: Fri Feb 10 15:46:59 2017 +0530

--
 .../main/resources/ui/app/controllers/queue.js  | 103 ++-
 .../main/resources/ui/app/controllers/queues.js |   2 +-
 .../src/main/resources/ui/app/models/queue.js   |  11 ++
 .../src/main/resources/ui/app/serializers.js|   5 +
 .../src/main/resources/ui/app/store.js  |   9 ++
 .../main/resources/ui/app/templates/queue.hbs   |  55 +++---
 6 files changed, 171 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/97994e23/contrib/views/capacity-scheduler/src/main/resources/ui/app/controllers/queue.js
--
diff --git 
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/controllers/queue.js
 
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/controllers/queue.js
index 589dcd0..d3adeb4 100644
--- 
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/controllers/queue.js
+++ 
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/controllers/queue.js
@@ -23,9 +23,9 @@ var _stopState = 'STOPPED';
 
 App.QueueController = Ember.ObjectController.extend({
   needs:['queues','configs'],
+  isPriorityUtilizationSupported: 
Ember.computed.alias('store.isPriorityUtilizationSupported'),
   isRangerEnabledForYarn : function() {
 var isRanger = this.get('controllers.configs.isRangerEnabledForYarn');
-console.log("controllers.queue : isRanger : ", isRanger);
 if (isRanger == null || typeof isRanger == 'undefined') {
   return false;
 }
@@ -159,6 +159,16 @@ App.QueueController = Ember.ObjectController.extend({
*/
   orderingPolicyValues: [null,'fifo', 'fair'],
 
+  /**
+   * Possible array of options for ordering policy
+   * @type {Array}
+   */
+  orderingPolicyOptions: [
+{label: '', value: null},
+{label: 'FIFO', value: 'fifo'},
+{label: 'Fair', value: 'fair'}
+  ],
+
 
   // COMPUTED PROPERTIES
 
@@ -344,6 +354,16 @@ App.QueueController = Ember.ObjectController.extend({
 return this.get('content.ordering_policy');
   }.property('content.ordering_policy'),
 
+  currentLeafQueueOP: function(key, val) {
+if (arguments.length > 1 && this.get('content.isLeafQ')) {
+  if (!this.get('isFairOP')) {
+this.send('rollbackProp', 'enable_size_based_weight', 
this.get('content'));
+  }
+  this.set('content.ordering_policy', val || null);
+}
+return this.get('content.ordering_policy');
+  }.property('content.ordering_policy'),
+
   /**
* Does ordering policy is equal to 'fair'
* @type {Boolean}
@@ -372,6 +392,87 @@ App.QueueController = Ember.ObjectController.extend({
 }.bind(this));
   }.observes('content'),
 
+  /**
+   * Add observer for queue priority.
+   * Sets ordering_policy=priority-utilization to parent queue if children 
queues have different priorities
+   * Also reset back t0 original ordering_policy if children have same zero 
priorities
+   * @method priorityObserver
+   */
+  priorityObserver: function() {
+if (!this.get('isPriorityUtilizationSupported')) {
+  return;
+}
+var parentQueue = this.get('parentQueue');
+if (parentQueue) {
+  var hasDifferent = this.isChildrenPrioritiesDifferent(parentQueue);
+  if (hasDifferent) {
+this.setOrderingPolicyConfigs(parentQueue);
+  } else {
+this.rollbackOrderingPolicyConfigs(parentQueue);
+  }
+}
+  }.observes('content.priority'),
+
+  /**
+   * Returns boolean if children queues have different priorities for a given 
queue
+   * @method isChildrenPrioritiesDifferent
+   */
+  isChildrenPrioritiesDifferent: function(queue) {
+var hasDifferent = false;
+var children = queue.get('childrenQueues');
+var priorities = children.map(function(que) {
+  return que.get('priority');
+});
+hasDifferent = priorities.some(function(prio) {
+  return prio > 0;
+});
+return hasDifferent;
+  },
+
+  /**
+   * Sets queue ordering_policy=priority-utilization when children queues have 
different priorities
+   * @method setOrderingPolicyConfigs
+   */
+  setOrderingPolicyConfigs: function(queue) {
+queue.set('ordering_policy', 'priority-utilization');
+  },
+
+  /**
+   * Rollback 

[24/50] [abbrv] ambari git commit: AMBARI-19963 Deviation alerts fail with "No JSON object could be decoded" (dsen)

[ncole]

AMBARI-19963 Deviation alerts fail with "No JSON object could be decoded" (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe1704e1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe1704e1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe1704e1

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: fe1704e12287685f8ca0fed179eb471556eee37b
Parents: 33caec2
Author: Dmytro Sen 
Authored: Fri Feb 10 19:52:40 2017 +0200
Committer: Dmytro Sen 
Committed: Fri Feb 10 19:52:40 2017 +0200

--
 .../src/main/python/ambari_commons/network.py   | 39 
 .../package/scripts/metrics_grafana_util.py |  2 +-
 .../0.1.0/package/scripts/network.py| 39 
 .../0.1.0/package/scripts/service_check.py  |  2 +-
 .../package/alerts/alert_metrics_deviation.py   | 14 +--
 .../package/alerts/alert_metrics_deviation.py   | 14 +--
 .../2.0.6/HDFS/test_alert_metrics_deviation.py  |  2 +
 7 files changed, 65 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1704e1/ambari-common/src/main/python/ambari_commons/network.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/network.py 
b/ambari-common/src/main/python/ambari_commons/network.py
new file mode 100644
index 000..b5b1cd6
--- /dev/null
+++ b/ambari-common/src/main/python/ambari_commons/network.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+"""
+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.
+
+"""
+
+import httplib
+import ssl
+
+from resource_management.core.exceptions import Fail
+
+def get_http_connection(host, port, https_enabled=False, ca_certs=None):
+  if https_enabled:
+if ca_certs:
+  check_ssl_certificate(host, port, ca_certs)
+return httplib.HTTPSConnection(host, port)
+  else:
+return httplib.HTTPConnection(host, port)
+
+def check_ssl_certificate(host, port, ca_certs):
+  try:
+ssl.get_server_certificate((host, port), ssl_version=ssl.PROTOCOL_SSLv23, 
ca_certs=ca_certs)
+  except (ssl.SSLError) as ssl_error:
+raise Fail("Failed to verify the SSL certificate for https://{0}:{1} with 
CA certificate in {2}"
+   .format(host, port, ca_certs))

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1704e1/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
index 84dcd99..a751330 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
@@ -31,7 +31,7 @@ import random
 import time
 import socket
 import ambari_simplejson as json
-import network
+import ambari_commons.network as network
 import os
 
 GRAFANA_CONNECT_TRIES = 15

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1704e1/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/network.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/network.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/network.py
deleted file mode 100644
index 672ee53..000
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/network.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-"""
-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 

[28/50] [abbrv] ambari git commit: AMBARI-19971. HiveServerInteractive. (1). Use the correct value for Node(s) used for running LLAP Daemon(s). (2). Set 'num_llap_nodes' calculated value only for non

[ncole]

AMBARI-19971. HiveServerInteractive. (1). Use the correct value for Node(s) 
used for running LLAP Daemon(s). (2). Set 'num_llap_nodes' calculated value 
only for non Ambari managed queue.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4c83843
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4c83843
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4c83843

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: f4c83843674764918bd50443705af1fce9852a2b
Parents: 38a17a7
Author: Swapan Shridhar 
Authored: Fri Feb 10 13:29:41 2017 -0800
Committer: Swapan Shridhar 
Committed: Fri Feb 10 15:13:48 2017 -0800

--
 .../package/scripts/hive_server_interactive.py  | 12 ++---
 .../0.12.0.2.0/package/scripts/params_linux.py  |  2 +
 .../HIVE/configuration/hive-interactive-env.xml |  4 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|  9 +++-
 .../HIVE/configuration/hive-interactive-env.xml | 31 -
 .../stacks/2.5/common/test_stack_advisor.py | 49 ++--
 6 files changed, 83 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c83843/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index 1f1d9a8..2ab48ae 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -281,10 +281,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 
   unique_name = "llap-slider%s" % 
datetime.utcnow().strftime('%Y-%m-%d_%H-%M-%S')
 
-  cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --instances {params.num_llap_nodes}"
-   " --slider-am-container-mb {params.slider_am_container_mb} 
--size {params.llap_daemon_container_size}m"
-   " --cache {params.hive_llap_io_mem_size}m --xmx 
{params.llap_heap_size}m --loglevel {params.llap_log_level}"
-   " {params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
+  cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --slider-am-container-mb {params.slider_am_container_mb} "
+   "--size {params.llap_daemon_container_size}m --cache 
{params.hive_llap_io_mem_size}m --xmx {params.llap_heap_size}m "
+   "--loglevel {params.llap_log_level} 
{params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
 
   # Append params that are supported from Hive llap GA version.
   if params.stack_supports_hive_interactive_ga:
@@ -300,11 +299,12 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 else:
   Logger.info("Setting slider_placement: 4, as 
llap_daemon_container_size : {0} <= 0.5 * "
  "YARN NodeManager 
Memory({1})".format(params.llap_daemon_container_size, params.yarn_nm_mem))
-cmd += format(" --slider-placement {slider_placement} 
--skiphadoopversion --skiphbasecp")
+cmd += format(" --slider-placement {slider_placement} 
--skiphadoopversion --skiphbasecp --instances 
{params.num_llap_daemon_running_nodes}")
 
 # Setup the logger for the ga version only
 cmd += format(" --logger {params.llap_logger}")
-
+  else:
+cmd += format(" --instances {params.num_llap_nodes}")
   if params.security_enabled:
 llap_keytab_splits = params.hive_llap_keytab_file.split("/")
 Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits))

http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c83843/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index a5618ca..936b194 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -685,6 +685,8 @@ if has_hive_interactive:
   num_retries_for_checking_llap_status = 

[50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556

[ncole]

Merge branch 'trunk' into branch-feature-AMBARI-12556


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/341cb124
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/341cb124
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/341cb124

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 341cb1247cbf67f5611766d8f5bf27bd878441e1
Parents: d222f57 7cb9a6a
Author: Nate Cole 
Authored: Mon Feb 13 17:11:38 2017 -0500
Committer: Nate Cole 
Committed: Mon Feb 13 17:11:38 2017 -0500

--
 .../controllers/clusters/UserAccessListCtrl.js  |5 +-
 .../clusters/UserAccessListCtrl_test.js |   90 -
 ambari-agent/conf/unix/ambari-agent |7 +-
 ambari-agent/pom.xml|3 +
 .../ambari_agent/CustomServiceOrchestrator.py   |   27 +-
 .../TestCustomServiceOrchestrator.py|   18 +
 .../python/ambari_agent/TestProcessUtils.py |  224 ++
 .../src/test/python/ambari_agent/TestShell.py   |5 +-
 .../resource_management/TestContentSources.py   |   11 +-
 .../ambari_commons/credential_store_helper.py   |   45 +
 .../src/main/python/ambari_commons/firewall.py  |3 +
 .../src/main/python/ambari_commons/network.py   |   39 +
 .../main/python/ambari_commons/process_utils.py |  100 +
 .../src/main/python/ambari_commons/shell.py |   54 +-
 .../python/resource_management/core/logger.py   |4 +
 .../python/resource_management/core/shell.py|6 +-
 .../python/resource_management/core/source.py   |8 +-
 .../functions/get_not_managed_resources.py  |   19 +-
 .../HDP/2.1.1/services/STORM/metrics.json   |   10 +-
 .../ambari-infra-solr-plugin/pom.xml|   56 +
 .../InfraKerberosHostValidator.java |   54 +
 .../InfraRuleBasedAuthorizationPlugin.java  |  542 +++
 .../InfraUserRolesLookupStrategy.java   |   49 +
 .../InfraKerberosHostValidatorTest.java |  114 +
 .../InfraRuleBasedAuthorizationPluginTest.java  |  247 ++
 .../InfraUserRolesLookupStrategyTest.java   |   83 +
 .../ambari-logsearch-assembly/pom.xml   |   15 +-
 .../logsearch/common/LogSearchConstants.java|1 -
 .../UserConfigRequestQueryConverter.java|   17 +-
 .../ambari/logsearch/doc/DocConstants.java  |3 -
 .../logsearch/manager/UserConfigManager.java|   53 +-
 .../request/UserConfigParamDefinition.java  |6 -
 .../model/request/impl/UserConfigRequest.java   |   15 +-
 .../model/response/UserConfigData.java  |   11 -
 .../logsearch/rest/UserConfigResource.java  |   17 +-
 .../ambari/logsearch/solr/SolrConstants.java|1 -
 .../src/main/webapp/index.html  |  211 +-
 .../daterangepicker/css/daterangepicker.css |  415 +++
 .../daterangepicker/js/daterangepicker.js   | 1560 
 .../libs/custom/timezone/WorldMapGenerator.js   | 3474 ++
 .../libs/custom/timezone/jstz-1.0.4.min.js  |2 +
 .../daterangepicker/css/daterangepicker.css |  415 ---
 .../other/daterangepicker/js/daterangepicker.js | 1560 
 .../libs/other/timezone/WorldMapGenerator.js| 3471 -
 .../libs/other/timezone/jstz-1.0.4.min.js   |2 -
 .../webapp/libs/other/timezone/mapdata.json | 3158 
 .../src/main/webapp/scripts/Init.js |  439 ++-
 .../scripts/views/common/DashboardLayout.js |   80 -
 .../scripts/views/common/EventHistoryLayout.js  |1 -
 .../views/dashboard/DashboardLayoutView.js  |  354 --
 .../scripts/views/dashboard/MainLayoutView.js   | 1259 ---
 .../views/dialog/ApplySearchFilterView.js   |   41 +-
 .../views/tabs/EventHistoryLayoutView.js|1 -
 .../dashboard/DashboardLayoutView_tmpl.html |   28 -
 .../UserConfigRequestQueryConverterTest.java|4 +-
 ambari-logsearch/pom.xml|1 +
 .../sink/flume/FlumeTimelineMetricsSink.java|2 +
 .../conf/hadoop-metrics2-hbase.properties.j2|   49 -
 .../src/main/conf/hadoop-metrics2.properties.j2 |   58 -
 .../metrics/timeline/PhoenixHBaseAccessor.java  |6 +-
 .../TimelineMetricAppAggregator.java|4 +-
 .../TimelineMetricClusterAggregatorSecond.java  |   92 +-
 .../aggregators/TimelineMetricReadHelper.java   |3 +-
 ...melineMetricClusterAggregatorSecondTest.java |  114 +-
 ambari-server/pom.xml   |6 +
 ambari-server/src/main/assemblies/server.xml|   25 +
 .../server/actionmanager/ActionDBAccessor.java  |5 +-
 .../actionmanager/ActionDBAccessorImpl.java |6 +-
 .../server/actionmanager/ActionScheduler.java   |   53 +-
 .../query/render/ClusterBlueprintRenderer.java  |  122 +
 .../server/controller/ControllerModule.java |   18 +-
 .../internal/ServiceResourceProvider.java   |1 -
 

[21/50] [abbrv] ambari git commit: AMBARI-19960 No config properties are changed after deleting service if it's performed after service page refresh. (ababiichuk)

[ncole]

AMBARI-19960 No config properties are changed after deleting service if it's 
performed after service page refresh. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eecb5a31
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eecb5a31
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eecb5a31

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: eecb5a311626f2bab09688d37949f0ccedde86a8
Parents: c9bea4a
Author: ababiichuk 
Authored: Fri Feb 10 16:02:12 2017 +0200
Committer: ababiichuk 
Committed: Fri Feb 10 18:22:30 2017 +0200

--
 ambari-web/app/controllers/main/service/item.js | 67 +++-
 .../test/controllers/main/service/item_test.js  | 46 +-
 2 files changed, 81 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eecb5a31/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 7010ab5..a7ed493 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -144,8 +144,9 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @type {String[]}
*/
   dependentServiceNames: function() {
-return 
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames');
-  }.property('content.serviceName'),
+return App.get('router.clusterController.isConfigsPropertiesLoaded') ?
+  
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames')
 : [];
+  }.property('content.serviceName', 
'App.router.clusterController.isConfigsPropertiesLoaded'),
 
   /**
* List of service names that could be deleted
@@ -204,32 +205,35 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
*/
   onLoadConfigsTags: function (data) {
 var self = this;
-var sitesToLoad = this.get('sitesToLoad'), allConfigs = [];
-var loadedSites = data.Clusters.desired_configs;
-var siteTagsToLoad = [];
-for (var site in loadedSites) {
-  if (sitesToLoad.contains(site)) {
-siteTagsToLoad.push({
-  siteName: site,
-  tagName: loadedSites[site].tag
-});
+
App.get('router.mainController.isLoading').call(App.get('router.clusterController'),
 'isConfigsPropertiesLoaded').done(function () {
+  var sitesToLoad = self.get('sitesToLoad'),
+allConfigs = [],
+loadedSites = data.Clusters.desired_configs,
+siteTagsToLoad = [];
+  for (var site in loadedSites) {
+if (sitesToLoad.contains(site)) {
+  siteTagsToLoad.push({
+siteName: site,
+tagName: loadedSites[site].tag
+  });
+}
   }
-}
-
App.router.get('configurationController').getConfigsByTags(siteTagsToLoad).done(function
 (configs) {
-  configs.forEach(function (site) {
-self.get('configs')[site.type] = site.properties;
-allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
-  });
+  
App.router.get('configurationController').getConfigsByTags(siteTagsToLoad).done(function
 (configs) {
+configs.forEach(function (site) {
+  self.get('configs')[site.type] = site.properties;
+  allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
+});
 
-  self.get('dependentServiceNames').forEach(function(serviceName) {
-var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
-var configsByService = allConfigs.filter(function (c) {
-  return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
+self.get('dependentServiceNames').forEach(function(serviceName) {
+  var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
+  var configsByService = allConfigs.filter(function (c) {
+return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
+  });
+  
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
 });
-
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
-  });
 
-  self.set('isServiceConfigsLoaded', true);
+self.set('isServiceConfigsLoaded', true);
+  });
 });
   },
 
@@ -1290,7 +1294,13 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   popupHeader = Em.I18n.t('services.service.delete.popup.header'),
   

[08/50] [abbrv] ambari git commit: AMBARI-19909. Export Blueprints does not contain the settings object and hence the credential store values (Madhuvanthi Radhakrishnan via smohanty)

[ncole]

AMBARI-19909. Export Blueprints does not contain the settings object and hence 
the credential store values (Madhuvanthi Radhakrishnan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc806659
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc806659
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc806659

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: bc806659971c05b873aa769007afa2916b2041dc
Parents: 00ed415
Author: Sumit Mohanty 
Authored: Thu Feb 9 18:39:22 2017 -0800
Committer: Sumit Mohanty 
Committed: Thu Feb 9 18:58:34 2017 -0800

--
 .../query/render/ClusterBlueprintRenderer.java  | 124 
 .../render/ClusterBlueprintRendererTest.java| 143 +++
 .../server/upgrade/UpgradeCatalog250Test.java   |  13 +-
 3 files changed, 274 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bc806659/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
index 342df44..4091ee8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
@@ -109,6 +109,20 @@ public class ClusterBlueprintRenderer extends BaseRenderer 
implements Renderer {
 if (resultTree.getChild(serviceType) == null) {
   resultTree.addChild(new HashSet(), serviceType);
 }
+TreeNode serviceNode = resultTree.getChild(serviceType);
+if (serviceNode == null) {
+  serviceNode = resultTree.addChild(new HashSet(), serviceType);
+}
+String serviceComponentType = Resource.Type.Component.name();
+TreeNode serviceComponentNode = resultTree.getChild(
+  serviceType + "/" + serviceComponentType);
+if (serviceComponentNode == null) {
+  serviceComponentNode = serviceNode.addChild(new HashSet(), 
serviceComponentType);
+}
+serviceComponentNode.getObject().add("ServiceComponentInfo/cluster_name");
+serviceComponentNode.getObject().add("ServiceComponentInfo/service_name");
+
serviceComponentNode.getObject().add("ServiceComponentInfo/component_name");
+
serviceComponentNode.getObject().add("ServiceComponentInfo/recovery_enabled");
 
 String hostType = Resource.Type.Host.name();
 String hostComponentType = Resource.Type.HostComponent.name();
@@ -214,9 +228,119 @@ public class ClusterBlueprintRenderer extends 
BaseRenderer implements Renderer {
 
 blueprintResource.setProperty("configurations", 
processConfigurations(topology));
 
+//Fetch settings section for blueprint
+blueprintResource.setProperty("settings", getSettings(clusterNode));
+
 return blueprintResource;
   }
 
+  /***
+   * Constructs the Settings object of the following form:
+   * "settings": [   {
+   "recovery_settings": [
+   {
+   "recovery_enabled": "true"
+   }   ]   },
+   {
+   "service_settings": [   {
+   "name": "HDFS",
+   "recovery_enabled": "true",
+   "credential_store_enabled": "true"
+   },
+   {
+   "name": "TEZ",
+   "recovery_enabled": "false"
+   },
+   {
+   "name": "HIVE",
+   "recovery_enabled": "false"
+   }   ]   },
+   {
+   "component_settings": [   {
+   "name": "DATANODE",
+   "recovery_enabled": "true"
+   }   ]   }   ]
+   *
+   * @param clusterNode
+   * @return A Collection> which represents the Setting 
Object
+   */
+  private Collection> getSettings(TreeNode 
clusterNode) {
+LOG.info("ClusterBlueprintRenderer: getSettings()");
+
+//Initialize collections to create appropriate json structure
+Collection> blueprintSetting = new 
ArrayList>();
+
+Set> recoverySettingValue = new HashSet>();
+Set> serviceSettingValue = new HashSet>();
+Set> componentSettingValue = new HashSet>();
+
+HashMap property = new HashMap<>();
+HashMap componentProperty = new HashMap<>();
+Boolean globalRecoveryEnabled = false;
+
+//Fetch the services, to obtain ServiceInfo and ServiceComponents
+Collection serviceChildren = 
clusterNode.getChild("services").getChildren();
+for (TreeNode serviceNode : serviceChildren) {
+  ResourceImpl service = 

[20/50] [abbrv] ambari git commit: AMBARI-19930. The service check status was set to TIMEOUT even if service check was failed. (mpapirkovskyy)

[ncole]

AMBARI-19930. The service check status was set to TIMEOUT even if service check 
was failed. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9bea4ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9bea4ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9bea4ab

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: c9bea4ab8f8a042e60103e8bb8880fc718fa3cf3
Parents: fc9788a
Author: Myroslav Papirkovskyi 
Authored: Thu Feb 9 20:11:26 2017 +0200
Committer: Myroslav Papirkovskyi 
Committed: Fri Feb 10 16:00:21 2017 +0200

--
 .../server/actionmanager/ActionScheduler.java   | 38 +++---
 .../actionmanager/TestActionScheduler.java  | 54 
 2 files changed, 53 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9bea4ab/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index dabcb98..fa2ad4f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -845,6 +845,28 @@ class ActionScheduler implements Runnable {
 commandsToSchedule.add(c);
 LOG.trace("===> commandsToSchedule(reschedule)=" + 
commandsToSchedule.size());
   }
+} else if (isHostStateUnknown(s, hostObj, roleStr)) {
+  String message = "Action was aborted due agent is not heartbeating 
or was restarted.";
+  LOG.warn("Host: {}, role: {}, actionId: {} . {}", host, roleStr,
+s.getActionId(), message);
+
+  db.abortHostRole(host, s.getRequestId(), s.getStageId(), 
c.getRole(), message);
+
+  if (null != cluster) {
+if (!RoleCommand.CUSTOM_COMMAND.equals(c.getRoleCommand())
+  && !RoleCommand.SERVICE_CHECK.equals(c.getRoleCommand())
+  && !RoleCommand.ACTIONEXECUTE.equals(c.getRoleCommand())) {
+  //commands above don't affect host component state (e.g. no 
in_progress state in process), transition will fail
+  transitionToFailedState(cluster.getClusterName(), 
c.getServiceName(), roleStr, host, now, false);
+}
+if (c.getRoleCommand().equals(RoleCommand.ACTIONEXECUTE)) {
+  processActionDeath(cluster.getClusterName(), c.getHostname(), 
roleStr);
+}
+  }
+
+  // Dequeue command
+  LOG.info("Removing command from queue, host={}, commandId={} ", 
host, c.getCommandId());
+  actionQueue.dequeue(host, c.getCommandId());
 } else if (status.equals(HostRoleStatus.PENDING)) {
   // in case of DEPENDENCY_ORDERED stage command can be scheduled only 
if all of it's dependencies are
   // already finished
@@ -1030,13 +1052,6 @@ class ActionScheduler implements Runnable {
   return false;
 }
 
-// Fast fail task if host state is unknown
-if (null != host &&
-  (host.getState().equals(HostState.HEARTBEAT_LOST) || 
wasAgentRestartedDuringOperation(host, stage, role))) {
-  LOG.debug("Timing out action since agent is not heartbeating or agent 
was restarted.");
-  return true;
-}
-
 // tasks are held in a variety of in-memory maps that require a hostname 
key
 // host being null is ok - that means it's a server-side task
 String hostName = (null == host) ? null : host.getHostName();
@@ -1053,6 +1068,15 @@ class ActionScheduler implements Runnable {
 return false;
   }
 
+  private boolean isHostStateUnknown(Stage stage, Host host, String role) {
+if (null != host &&
+  (host.getState().equals(HostState.HEARTBEAT_LOST) || 
wasAgentRestartedDuringOperation(host, stage, role))) {
+  LOG.debug("Abort action since agent is not heartbeating or agent was 
restarted.");
+  return true;
+}
+return false;
+  }
+
   private boolean hasCommandInProgress(Stage stage, String host) {
 List commandWrappers = 
stage.getExecutionCommands(host);
 for (ExecutionCommandWrapper wrapper : commandWrappers) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9bea4ab/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
 

[18/50] [abbrv] ambari git commit: AMBARI-19768. Broken kill_process_with_children shell single liner (dlysnichenko)

[ncole]

AMBARI-19768. Broken kill_process_with_children shell single liner 
(dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41034aa1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41034aa1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41034aa1

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 41034aa157cc7b36f1635064055b83deb5f542bc
Parents: 59545f7
Author: Lisnichenko Dmitro 
Authored: Fri Feb 10 15:15:20 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Fri Feb 10 15:15:20 2017 +0200

--
 .../python/ambari_agent/TestProcessUtils.py | 224 +++
 .../src/test/python/ambari_agent/TestShell.py   |   5 +-
 .../main/python/ambari_commons/process_utils.py | 100 +
 .../src/main/python/ambari_commons/shell.py |  54 ++---
 4 files changed, 346 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/41034aa1/ambari-agent/src/test/python/ambari_agent/TestProcessUtils.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestProcessUtils.py 
b/ambari-agent/src/test/python/ambari_agent/TestProcessUtils.py
new file mode 100644
index 000..8331910
--- /dev/null
+++ b/ambari-agent/src/test/python/ambari_agent/TestProcessUtils.py
@@ -0,0 +1,224 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+'''
+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.
+'''
+
+from ambari_agent import main
+
+main.MEMORY_LEAK_DEBUG_FILEPATH = "/tmp/memory_leak_debug.out"
+import unittest
+import signal
+import subprocess, time
+from mock.mock import patch, MagicMock, PropertyMock, call
+from ambari_commons import process_utils
+
+process_tree = {"111": "222\n 22",
+"222": "333\n 33",
+"22": "44\n 444",}
+
+
+class TestProcessUtils(unittest.TestCase):
+  @patch("subprocess.Popen")
+  def test_kill(self, popen_mock):
+process_mock = MagicMock()
+process_mock.communicate.return_value = (None, None)
+returncode_mock = PropertyMock()
+returncode_mock.return_value = 0
+type(process_mock).returncode = returncode_mock
+popen_mock.return_value = process_mock
+process_utils.kill_pids(["12321113230", "2312415453"], signal.SIGTERM)
+expected = [call(['kill', '-15', '12321113230', '2312415453'], stderr=-1, 
stdout=-1)]
+self.assertEquals(popen_mock.call_args_list, expected)
+
+  @patch("subprocess.Popen")
+  def test_get_children(self, popen_mock):
+
+process_mock = MagicMock()
+process_mock.communicate.return_value = ("123 \n \n 321\n", None)
+popen_mock.return_value = process_mock
+returncode_mock = PropertyMock()
+returncode_mock.return_value = 0
+type(process_mock).returncode = returncode_mock
+result = process_utils.get_children("2312415453")
+
+self.assertEquals(result, ["123", "321"])
+
+expected = [
+  call(['ps', '-o', 'pid', '--no-headers', '--ppid', '2312415453'], 
stderr=subprocess.PIPE, stdout=subprocess.PIPE)]
+self.assertEquals(popen_mock.call_args_list, expected)
+
+  @patch("subprocess.Popen")
+  def test_get_flat_process_tree(self, popen_mock):
+def side_effect(*args, **kwargs):
+  process_mock = MagicMock()
+  returncode_mock = PropertyMock()
+  returncode_mock.return_value = 0
+  type(process_mock).returncode = returncode_mock
+  if args[0][5] in process_tree.keys():
+process_mock.communicate.return_value = (process_tree[args[0][5]], 
None)
+  else:
+process_mock.communicate.return_value = ("", None)
+  return process_mock
+
+popen_mock.side_effect = side_effect
+result = process_utils.get_flat_process_tree("111")
+self.assertEquals(result, ['111', '222', '333', '33', '22', '44', '444'])
+
+expected = [call(['ps', '-o', 'pid', '--no-headers', '--ppid', '111'], 
stderr=-1, stdout=-1),
+call(['ps', '-o', 'pid', '--no-headers', '--ppid', '222'], 
stderr=-1, stdout=-1),
+call(['ps', 

[41/50] [abbrv] ambari git commit: AMBARI-19968. Control Log Level for all Hive components for log4j - UT fix (Madhuvanthi Radhakrishnan via smohanty)

[ncole]

AMBARI-19968. Control Log Level for all Hive components for log4j - UT fix 
(Madhuvanthi Radhakrishnan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b695bf2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b695bf2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b695bf2b

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b695bf2bfcb96b48e7896a6242d25cf786cb46df
Parents: 3a95192
Author: Sumit Mohanty 
Authored: Sun Feb 12 19:10:12 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Feb 12 19:10:12 2017 -0800

--
 .../org/apache/ambari/server/state/theme/TabLayout.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b695bf2b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
index 4f6cf8f..98222de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
@@ -19,16 +19,15 @@
 package org.apache.ambari.server.state.theme;
 
 
-
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+
 
 @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)

[37/50] [abbrv] ambari git commit: AMBARI-19884. Set a higher value of num aggregated files per container - HDP stack, YARN (Siddharth Seth via smohanty)

[ncole]

AMBARI-19884. Set a higher value of num aggregated files per container - HDP 
stack, YARN (Siddharth Seth via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d5100632
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d5100632
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d5100632

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d5100632624a671512ea44e6ad8f6ee9df3dba24
Parents: d6e0b26
Author: Sumit Mohanty 
Authored: Sat Feb 11 16:09:15 2017 -0800
Committer: Sumit Mohanty 
Committed: Sat Feb 11 16:09:48 2017 -0800

--
 .../HDP/2.5/services/YARN/configuration/yarn-site.xml   | 6 ++
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml| 5 +
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml  | 9 -
 .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml  | 1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
index 90b2243..b6fadcb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
@@ -47,6 +47,12 @@
 
   
   
+yarn.nodemanager.log-aggregation.num-log-files-per-app
+336
+The number of files to retain per container when continuous 
log aggregation is used
+
+  
+  
 yarn.nodemanager.container-metrics.unregister-delay-ms
 6
 The delay time ms to unregister container metrics after 
completion.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 100df8f..15837df 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -146,6 +146,11 @@
 
to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled"
 default-value="false"/>
 
+
+  yarn-site
+  
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 6e92141..8c7a9b1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -299,12 +299,19 @@
   
 
   
-  
+  
 
   Updating underutilized_preemption setting
 
   
 
+  
+  
+
+  Updating log aggregation retained files setting
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index bc68754..b83525a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -670,6 +670,7 @@
   
   
   
+  
 
 
 

[12/50] [abbrv] ambari git commit: AMBARI-19950. Hive View 2.0: Restrict user to change the bucket while editing a clustered table. (dipayanb)

[ncole]

AMBARI-19950. Hive View 2.0: Restrict user to change the bucket while editing a 
clustered table. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92cf5615
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92cf5615
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92cf5615

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 92cf561520572ac65ca6e593729bb13a3edff8e1
Parents: 232b585
Author: Dipayan Bhowmick 
Authored: Fri Feb 10 15:13:26 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Fri Feb 10 15:14:37 2017 +0530

--
 .../main/resources/ui/app/components/table-advanced-settings.js | 5 +
 .../ui/app/templates/components/table-advanced-settings.hbs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/92cf5615/contrib/views/hive20/src/main/resources/ui/app/components/table-advanced-settings.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/table-advanced-settings.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/table-advanced-settings.js
index 99a9bb6..5e58cd8 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/table-advanced-settings.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/table-advanced-settings.js
@@ -31,6 +31,7 @@ export default Ember.Component.extend({
   errors: [],
   editMode: false,
   disableTransactionInput: false,
+  disableNumBucketsInput: false,
 
   settings: {},
 
@@ -72,6 +73,10 @@ export default Ember.Component.extend({
 if(!Ember.isEmpty(this.get('settings.transactional')) && 
this.get('settings.transactional') && this.get('editMode')) {
   this.set('disableTransactionInput', true);
 }
+
+if(!Ember.isEmpty(this.get('settings.numBuckets')) && 
this.get('settings.numBuckets') && this.get('editMode')) {
+  this.set('disableNumBucketsInput', true);
+}
   },
 
   locationInputObserver: Ember.observer('showLocationInput', function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/92cf5615/contrib/views/hive20/src/main/resources/ui/app/templates/components/table-advanced-settings.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/table-advanced-settings.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/table-advanced-settings.hbs
index f7a92ce..4aca56d 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/table-advanced-settings.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/table-advanced-settings.hbs
@@ -39,7 +39,7 @@
   Number of buckets
   
 
-  {{input type="number" class="form-control" 
value=settings.numBuckets}}
+  {{input type="number" class="form-control" 
value=settings.numBuckets disabled=disableNumBucketsInput}}
   {{#if hasNumBucketError}}
 {{numBucketErrorText}}
   {{/if}}

[09/50] [abbrv] ambari git commit: AMBARI-19935. Details of multi-condition Ranger Access policy are not visible in Hive View - Table Authorizations column. (dipayanb)

[ncole]

AMBARI-19935. Details of multi-condition Ranger Access policy are not visible 
in Hive View - Table Authorizations column. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ce10423
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ce10423
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ce10423

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 2ce10423190f999b794140a270601a62dc6b7f95
Parents: bc80665
Author: Dipayan Bhowmick 
Authored: Fri Feb 10 14:59:33 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Fri Feb 10 15:00:03 2017 +0530

--
 .../resources/system/ranger/RangerService.java  | 32 ++-
 .../databases/database/tables/table/auth.hbs| 41 
 2 files changed, 47 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce10423/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
index 9debe42..d300d9a 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
@@ -137,8 +137,9 @@ public class RangerService {
 JSONArray policyItems = (JSONArray) policyJson.get("policyItems");
 Policy policy = new Policy(name);
 
-if (policyItems.size() > 0) {
-  JSONObject policyItem = (JSONObject) policyItems.get(0);
+for(Object item: policyItems) {
+  PolicyCondition condition = new PolicyCondition();
+  JSONObject policyItem = (JSONObject) item;
   JSONArray usersJson = (JSONArray) policyItem.get("users");
   JSONArray groupsJson = (JSONArray) policyItem.get("groups");
   JSONArray accesses = (JSONArray) policyItem.get("accesses");
@@ -148,19 +149,20 @@ public class RangerService {
 JSONObject access = (JSONObject) accessJson;
 Boolean isAllowed = (Boolean) access.get("isAllowed");
 if (isAllowed) {
-  policy.addAccess((String) access.get("type"));
+  condition.addAccess((String) access.get("type"));
 }
   }
 
   for (Object user : usersJson) {
-policy.addUser((String) user);
+condition.addUser((String) user);
   }
 
   for (Object group : groupsJson) {
-policy.addGroup((String) group);
+condition.addGroup((String) group);
   }
-}
 
+  policy.addCondition(condition);
+}
 
 return policy;
   }
@@ -266,9 +268,7 @@ public class RangerService {
*/
   public static class Policy {
 private String name;
-private List users = new ArrayList<>();
-private List groups = new ArrayList<>();
-private List accesses = new ArrayList<>();
+private List conditions = new ArrayList<>();
 
 public Policy(String name) {
   this.name = name;
@@ -282,6 +282,20 @@ public class RangerService {
   this.name = name;
 }
 
+public List getConditions() {
+  return conditions;
+}
+
+public void addCondition(PolicyCondition condition) {
+  this.conditions.add(condition);
+}
+  }
+
+  public static class PolicyCondition {
+private List users = new ArrayList<>();
+private List groups = new ArrayList<>();
+private List accesses = new ArrayList<>();
+
 public List getUsers() {
   return users;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce10423/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
index 416f12f..e00eeb8 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
@@ -25,7 +25,7 @@
   
 
 
-  POLICY NAME
+  
   USERS
   GROUPS
   ACCESS
@@ -34,23 +34,30 @@
 
 {{#each model.policies as |policy|}}
   
-{{policy.name}}
-
-  {{#each policy.users as |user|}}
-{{user}}
-  {{/each}}
-
-
-  {{#each policy.groups as |group|}}
- 

[38/50] [abbrv] ambari git commit: AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)

[ncole]

AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eac0f57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eac0f57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eac0f57

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 6eac0f57a61da4e76b175f0de43ab315a665b9c2
Parents: d510063
Author: Aravindan Vijayan 
Authored: Sun Feb 12 08:34:41 2017 -0800
Committer: Aravindan Vijayan 
Committed: Sun Feb 12 08:34:58 2017 -0800

--
 .../conf/hadoop-metrics2-hbase.properties.j2| 49 -
 .../src/main/conf/hadoop-metrics2.properties.j2 | 58 
 .../hadoop-metrics2-hbase.properties.j2 |  4 ++
 3 files changed, 4 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
deleted file mode 100644
index c819301..000
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
+++ /dev/null
@@ -1,49 +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.
-
-# See http://wiki.apache.org/hadoop/GangliaMetrics
-#
-# Make sure you know whether you are using ganglia 3.0 or 3.1.
-# If 3.1, you will have to patch your hadoop instance with HADOOP-4675
-# And, yes, this file is named hadoop-metrics.properties rather than
-# hbase-metrics.properties because we're leveraging the hadoop metrics
-# package and hadoop-metrics.properties is an hardcoded-name, at least
-# for the moment.
-#
-# See also http://hadoop.apache.org/hbase/docs/current/metrics.html
-
-# HBase-specific configuration to reset long-running stats (e.g. compactions)
-# If this variable is left out, then the default is no expiration.
-hbase.extendedperiod = 3600
-
-# Configuration of the "hbase" context for timeline metrics service
-hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.period=10
-hbase.collector={{timeline_server_hosts}}:6188
-
-# Configuration of the "jvm" context for timeline metrics service
-jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-jvm.period=10
-jvm.collector={{timeline_server_hosts}}:6188
-
-# Configuration of the "rpc" context for timeline metrics service
-rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-rpc.period=10
-rpc.collector={{timeline_server_hosts}}:6188
-
-# Following hadoop example
-hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=10
-hbase.sink.timeline.collector=http://{{timeline_server_hosts}}:6188
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
deleted file mode 100644
index ec1377d..000
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
+++ /dev/null
@@ -1,58 +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 

[35/50] [abbrv] ambari git commit: AMBARI-19977. Increase default timeout for RM (aonishuk)

[ncole]

AMBARI-19977. Increase default timeout for RM (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6098d342
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6098d342
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6098d342

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 6098d342c14ede52f2743274482ce3d37c0917b6
Parents: 77b5b16
Author: Andrew Onishuk 
Authored: Sat Feb 11 18:16:48 2017 +0200
Committer: Andrew Onishuk 
Committed: Sat Feb 11 18:16:48 2017 +0200

--
 .../stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6098d342/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index fcd9380..0eb3366 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -127,13 +127,13 @@
   
   
 yarn.resourcemanager.connect.retry-interval.ms
-3
+15000
 How often to try connecting to the 
ResourceManager.
 
   
   
 yarn.resourcemanager.connect.max-wait.ms
-90
+-1
 Maximum time to wait to establish connection to 
ResourceManager
 
   

[02/50] [abbrv] ambari git commit: AMBARI-19870. Add Superset as a UI for Druid in HDP (Nishant Bangarwa via smohanty)

[ncole]

AMBARI-19870. Add Superset as a UI for Druid in HDP (Nishant Bangarwa via 
smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c0f3c46
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c0f3c46
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c0f3c46

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 3c0f3c46b97f00a24cf0711c43bc24df3ed6df84
Parents: d5755ba
Author: Sumit Mohanty 
Authored: Thu Feb 9 12:32:17 2017 -0800
Committer: Sumit Mohanty 
Committed: Thu Feb 9 12:32:17 2017 -0800

--
 .../DRUID/0.9.2/configuration/druid-common.xml  |  10 +-
 .../0.9.2/configuration/druid-superset-env.xml  | 115 
 .../0.9.2/configuration/druid-superset.xml  | 178 +++
 .../common-services/DRUID/0.9.2/metainfo.xml|  26 ++-
 .../DRUID/0.9.2/package/scripts/params.py   |  45 -
 .../0.9.2/package/scripts/status_params.py  |   2 +
 .../DRUID/0.9.2/package/scripts/superset.py | 153 
 .../DRUID/0.9.2/package/templates/superset.sh   |  95 ++
 .../DRUID/0.9.2/quicklinks/quicklinks.json  |  13 ++
 .../DRUID/0.9.2/role_command_order.json |  18 ++
 .../DRUID/0.9.2/themes/theme.json   |  84 -
 .../stacks/HDP/2.6/role_command_order.json  |  19 --
 .../stacks/HDP/2.6/services/DRUID/kerberos.json |  33 
 .../stacks/HDP/2.6/services/stack_advisor.py|  11 ++
 .../test/python/stacks/2.6/configs/default.json |   3 +
 15 files changed, 774 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c0f3c46/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
index a494750..d3b53cd 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
@@ -132,20 +132,20 @@
   
 database_name
 druid
-Metadata storage database name
-Metadata storage database name
+Druid Metadata storage database name
+Druid Metadata storage database name
 
   
   
 metastore_hostname
 localhost
-Metadata storage hostname name
-Metadata storage hostname name
+Metadata storage hostname
+Metadata storage hostname
 
   
   
 druid.metadata.storage.type
-Metadata storage type
+Druid Metadata storage type
 derby
 
   false

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c0f3c46/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
new file mode 100644
index 000..61421c0
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
@@ -0,0 +1,115 @@
+
+
+
+
+  
+superset_log_dir
+/var/log/superset
+Superset log dir
+Superset log directory.
+
+  directory
+
+
+  
+  
+superset_pid_dir
+/var/run/superset
+Superset pid dir
+Superset pid directory.
+
+  directory
+
+
+  
+  
+superset_admin_user
+admin
+Superset Admin Username
+
+  Superset Username. This value cannot be modified by Ambari
+  except on initial install. Please make sure the username change in
+  Superset is reflected in Ambari.
+
+
+  db_user
+  false
+
+
+  
+  
+superset_admin_password
+
+PASSWORD
+Superset Admin Password
+
+  Superset password. This value cannot be modified by Ambari
+  except on initial install. Please make sure the password change in
+  Superset is reflected back in Ambari.
+
+
+  false
+  password
+
+
+  
+  
+superset_admin_firstname
+
+
+  
+  
+superset_admin_lastname
+
+
+  
+  
+superset_admin_email
+
+
+  
+  
+content
+superset-env template
+
+  # Set environment variables here.
+
+  # Superset Home Dir
+  export SUPERSET_CONFIG_DIR={{superset_config_dir}}
+
+  # Superset Log Dir
+  export SUPERSET_LOG_DIR={{superset_log_dir}}
+
+  # Superset Log Dir
+  export SUPERSET_BIN_DIR={{superset_bin_dir}}

[47/50] [abbrv] ambari git commit: AMBARI-19967 - Ambari Server Unit Test Failures (jonathanhurley)

[ncole]

AMBARI-19967 - Ambari Server Unit Test Failures (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa32fec6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa32fec6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa32fec6

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: fa32fec6d891745885b976cc2dc13512706dfed9
Parents: 6c4cbc4
Author: Jonathan Hurley 
Authored: Fri Feb 10 12:09:38 2017 -0500
Committer: Jonathan Hurley 
Committed: Mon Feb 13 11:23:33 2017 -0500

--
 .../server/orm/dao/AlertDefinitionDAO.java  |  7 ++-
 .../ambari/server/orm/dao/AlertDispatchDAO.java | 45 
 .../server/orm/entities/AlertGroupEntity.java   |  9 ++--
 .../server/orm/dao/AlertDispatchDAOTest.java| 20 -
 .../state/cluster/AlertDataManagerTest.java |  5 ++-
 5 files changed, 36 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fa32fec6/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
index 703ff58..c3e3a9f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
@@ -321,16 +321,15 @@ public class AlertDefinitionDAO {
 EntityManager entityManager = entityManagerProvider.get();
 entityManager.persist(alertDefinition);
 
-AlertGroupEntity group = dispatchDao.findDefaultServiceGroup(
-alertDefinition.getClusterId(), alertDefinition.getServiceName());
+AlertGroupEntity group = 
dispatchDao.findDefaultServiceGroup(alertDefinition.getClusterId(),
+alertDefinition.getServiceName());
 
 if (null == group) {
   // create the default alert group for the new service; this MUST be done
   // before adding definitions so that they are properly added to the
   // default group
   String serviceName = alertDefinition.getServiceName();
-  group = dispatchDao.createDefaultGroup(alertDefinition.getClusterId(),
-  serviceName);
+  group = dispatchDao.createDefaultGroup(alertDefinition.getClusterId(), 
serviceName);
 }
 
 group.addAlertDefinition(alertDefinition);

http://git-wip-us.apache.org/repos/asf/ambari/blob/fa32fec6/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
index 3b9c97a..5bd84ad 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -52,6 +51,7 @@ import org.eclipse.persistence.config.QueryHints;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.util.concurrent.Striped;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -83,10 +83,11 @@ public class AlertDispatchDAO {
   private Provider m_clusters;
 
   /**
-   * A lock that ensures that group writes are protected. This is useful since
-   * groups can be created through different events/threads in the system.
+   * Used for ensuring that the concurrent nature of the event handler methods
+   * don't collide when attempting to creation alert groups for the same
+   * service.
*/
-  private final Lock m_groupLock = new ReentrantLock();
+  private Striped m_locksByService = Striped.lazyWeakLock(20);
 
   private static final Logger LOG = 
LoggerFactory.getLogger(AlertDispatchDAO.class);
 
@@ -195,24 +196,6 @@ public class AlertDispatchDAO {
   }
 
   /**
-   * Gets an alert group with the specified name across all clusters. Alert
-   * group names are unique within a cluster.
-   *
-   * @param groupName
-   *  the name of the group (not {@code null}).
-   * @return the alert group or {@code null} if none exists.
-   */
-  @RequiresSession
-  public AlertGroupEntity findGroupByName(String groupName) {
-TypedQuery query = 

[40/50] [abbrv] ambari git commit: AMBARI-19452 : Metrics of flume shows same values for all channels, sinks or sources in host. (wangjianfei via avijayan)

[ncole]

AMBARI-19452 : Metrics of flume shows same values for all channels,sinks or 
sources in host. (wangjianfei via avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a951927
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a951927
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a951927

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 3a9519279e3f3b9ba113fb1bc1d3241e6bd9f2a8
Parents: 5d695d8
Author: Aravindan Vijayan 
Authored: Sun Feb 12 14:23:54 2017 -0800
Committer: Aravindan Vijayan 
Committed: Sun Feb 12 14:23:54 2017 -0800

--
 .../controller/metrics/timeline/AMSPropertyProvider.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a951927/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index f194f8e..759f595 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -441,6 +441,14 @@ public abstract class AMSPropertyProvider extends 
MetricsPropertyProvider {
   } else {
 propertyId = substituteArgument(propertyId, "$1", 
metric.getInstanceId());
   }
+}else {
+  if(metric.getInstanceId() != null){
+//instanceId "CHANNEL.ch1"
+String instanceId = metric.getInstanceId();
+instanceId = instanceId.matches("^\\w+\\..+$") ? 
instanceId.split("\\.")[1]:"";
+//propertyId 
"metrics/flume/flume/CHANNEL/ch1/[ChannelCapacity]"
+if(!propertyId.contains(instanceId)) continue;
+  }
 }
 Object value = getValue(metric, temporalInfo);
 if (value != null && !containsArguments(propertyId)) {

[05/50] [abbrv] ambari git commit: AMBARI-19928. Solr grafana dashboards. (Willy Solaligue via yusaku)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/00ed4159/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json
new file mode 100644
index 000..6ae1b22
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json
@@ -0,0 +1,538 @@
+{
+  "id": null,
+  "title": "Solr - Hosts",
+  "originalTitle": "Solr - Hosts",
+  "tags": ["solr"],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Solr Hosts Dashboard",
+  "editable": true,
+  "error": false,
+  "height": "25px",
+  "id": 3,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "Row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 1,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": true,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "repeat": null,
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "none",
+  "app": "solr-host-app",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "hide": false,
+  "metric": "solr.admin.info.system.processCpuLoad",
+  "precision": "default",
+  "refId": "A",
+  "seriesAggregator": "none",
+  "templatedHost": "",
+  "transform": "none"
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Solr CPU Utilization",
+  "tooltip": {
+"shared": true,
+"value_type": "cumulative"
+  },
+  "transparent": false,
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"percentunit",
+"percent"
+  ]
+},
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 2,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": true,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  

[39/50] [abbrv] ambari git commit: AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)

[ncole]

AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d695d83
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d695d83
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d695d83

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 5d695d83d8d5f2e8b622757b434133bfaa125dc8
Parents: 6eac0f5
Author: Aravindan Vijayan 
Authored: Sun Feb 12 08:37:22 2017 -0800
Committer: Aravindan Vijayan 
Committed: Sun Feb 12 08:37:22 2017 -0800

--
 .../0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2  | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d695d83/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 8c6f86f..8c20f2b 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -42,19 +42,16 @@ 
hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.period=30
 hbase.collector.hosts={{ams_collector_hosts}}
 hbase.port={{metric_collector_port}}
-hbase.protocol={{metric_collector_protocol}}
 
 jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 jvm.period=30
 jvm.collector.hosts={{ams_collector_hosts}}
 jvm.port={{metric_collector_port}}
-jvm.protocol={{metric_collector_protocol}}
 
 rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 rpc.period=30
 rpc.collector.hosts={{ams_collector_hosts}}
 rpc.port={{metric_collector_port}}
-rpc.protocol={{metric_collector_protocol}}
 
 
*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
@@ -63,7 +60,6 @@ hbase.sink.timeline.period={{metrics_collection_period}}
 hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}}
 hbase.sink.timeline.port={{metric_collector_port}}
-hbase.sink.timeline.protocol={{metric_collector_protocol}}
 hbase.sink.timeline.serviceName-prefix=ams
 
 # HTTPS properties

[15/50] [abbrv] ambari git commit: AMBARI-19954.Workflow designer is getting hung while importing the workflow.(Padma Priya N via gauravn7)

[ncole]

AMBARI-19954.Workflow designer is getting hung while importing the 
workflow.(Padma Priya N via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1339d52b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1339d52b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1339d52b

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1339d52bb1e685bb363157ac949e52da970113b8
Parents: d7e11e9
Author: Gaurav Nagar 
Authored: Fri Feb 10 16:48:56 2017 +0530
Committer: Gaurav Nagar 
Committed: Fri Feb 10 16:49:45 2017 +0530

--
 .../ui/app/components/decision-add-branch.js|  3 +-
 .../ui/app/components/flow-designer.js  | 25 ++---
 .../ui/app/components/transition-config.js  |  2 +-
 .../ui/app/domain/cytoscape-flow-renderer.js| 38 ++--
 .../app/templates/components/flow-designer.hbs  |  2 +-
 5 files changed, 49 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1339d52b/contrib/views/wfmanager/src/main/resources/ui/app/components/decision-add-branch.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/decision-add-branch.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/decision-add-branch.js
index e4b2224..65d0974 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/decision-add-branch.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/decision-add-branch.js
@@ -54,8 +54,9 @@ export default Ember.Component.extend(Validations, 
FindNodeMixin,{
 }
 self.set("isInsertAction",false);
 this.set("newNodeType",null);
+this.get('flowRenderer').populateOkToandErrorTONodes(node);
 var 
commonTarget=this.findCommonTargetNode(this.workflow.startNode,this.get('node'));
-var descendantNodes=this.getDesendantNodes(this.get('node'));
+var descendantNodes= this.get('node.validOkToNodes');
 if (commonTarget){
   descendantNodes.removeObject(commonTarget);
   descendantNodes.unshiftObject(commonTarget);

http://git-wip-us.apache.org/repos/asf/ambari/blob/1339d52b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index fd7a258..83a1b27 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -60,7 +60,8 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   previewXml:"",
   supportedActionTypes:["java", "hive", "pig", "sqoop", "shell", "spark", 
"map-reduce", "hive2", "sub-workflow", "distcp", "ssh", "FS"],
   workflow:null,
-  hoveredWidget:null,/**/
+  flowRenderer:null,
+  hoveredWidget:null,
   showingConfirmationNewWorkflow:false,
   showingWorkflowConfigProps:false,
   workflowSubmitConfigs:{},
@@ -107,16 +108,12 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 var id = 'cy-' + Math.ceil(Math.random() * 1000);
 this.set('cyId', id);
 this.sendAction('register', this.get('tabInfo'), this);
+this.set('flowRenderer',CytoscapeRenderer.create());
+this.set('workflow',Workflow.create({}));
 CommonUtils.setTestContext(this);
   }.on('init'),
   elementsInserted :function(){
-if (this.useCytoscape){
-  this.flowRenderer=CytoscapeRenderer.create({id : this.get('cyId')});
-}else{
-  this.flowRenderer=JSPlumbRenderer.create({});
-}
 this.setConentWidth();
-this.set('workflow',Workflow.create({}));
 if(this.get("xmlAppPath")){
   this.showExistingWorkflow();
   return;
@@ -241,14 +238,13 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   },
   nodeRendered: function(){
 this.doValidation();
-if(this.get('renderNodeTransitions')){
-  
this.flowRenderer.onDidUpdate(this,this.get("workflow").startNode,this.get("workflow"));
-  this.layout();
-  this.set('renderNodeTransitions',false);
-}
 this.resize();
 this.persistWorkInProgress();
   }.on('didUpdate'),
+  renderTransitions : function(){
+
this.flowRenderer.onDidUpdate(this,this.get("workflow").startNode,this.get("workflow"));
+this.layout();
+  },
   resize(){
 this.flowRenderer.resize();
   },
@@ -261,12 +257,13 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 var canvasHeight=Ember.$(window).height()-panelOffset.top-25;
 

[26/50] [abbrv] ambari git commit: AMBARI-19831. ADDENDUM. HDP 3.0 TP - Support changed configs and scripts for YARN/MR (alejandro)

[ncole]

AMBARI-19831. ADDENDUM. HDP 3.0 TP - Support changed configs and scripts for 
YARN/MR (alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4381561f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4381561f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4381561f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 4381561f92aeb91b1a2b3cafff4a860efde81dff
Parents: e8a9961
Author: Alejandro Fernandez 
Authored: Fri Feb 10 13:09:12 2017 -0800
Committer: Alejandro Fernandez 
Committed: Fri Feb 10 13:16:34 2017 -0800

--
 .../common-services/YARN/3.0.0.3.0/package/scripts/service.py| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4381561f/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
index 78b2428..e0d6475 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
@@ -44,7 +44,7 @@ def service(componentName, action='start', 
serviceName='yarn'):
   if serviceName == 'mapreduce' and componentName == 'historyserver':
 delete_pid_file = True
 daemon = format("{mapred_bin}/mr-jobhistory-daemon.sh")
-pid_file = 
format("{mapred_pid_dir}/mapred-{mapred_user}-{componentName}.pid")
+pid_file = 
format("{mapred_pid_dir}/hadoop-{mapred_user}-{componentName}.pid")
 usr = params.mapred_user
 log_dir = params.mapred_log_dir
   else:
@@ -52,7 +52,7 @@ def service(componentName, action='start', 
serviceName='yarn'):
 # may not work correctly when stopping the service
 delete_pid_file = False
 daemon = format("{yarn_bin}/yarn-daemon.sh")
-pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-{componentName}.pid")
+pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-{componentName}.pid")
 usr = params.yarn_user
 log_dir = params.yarn_log_dir
 

[19/50] [abbrv] ambari git commit: AMBARI-19951. Set "yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled" property value during RU/EU to HDP2.6 (dgrinenko vi

[ncole]

AMBARI-19951. Set 
"yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled"
 property value during RU/EU to HDP2.6 (dgrinenko via dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc9788af
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc9788af
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc9788af

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: fc9788af1d5c9533de5961e5bc97cf46b2a98b44
Parents: 41034aa
Author: Lisnichenko Dmitro 
Authored: Fri Feb 10 15:16:53 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Fri Feb 10 15:16:53 2017 +0200

--
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 +++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml| 6 ++
 .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml| 1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 7 +++
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml| 7 +++
 .../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml| 1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 7 +++
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml| 7 +++
 .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml| 1 +
 9 files changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index eac318e..478f9b4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -511,6 +511,13 @@
 yarn-env
 
   
+  
+yarn-site
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 8da11ff..0d4e3b8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -319,6 +319,12 @@
 
   
 
+  
+
+  Updating underutilized_preemption setting
+
+  
+
   
 
   Verifying LZO codec path for mapreduce

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index 01fc102..58db4a9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -762,6 +762,7 @@
   
   
   
+  
 
  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index cc50ac5..18f5fa1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -297,6 +297,13 @@
 yarn-env
 
   
+  
+yarn-site
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 046904b..eedf98c 100644
--- 

[46/50] [abbrv] ambari git commit: AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)

[ncole]

AMBARI-19981. Hive View 2.0: Enable Notifications. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c4cbc4f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c4cbc4f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c4cbc4f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 6c4cbc4f7efddd55e063dbff470fa04eee2e68bf
Parents: a6445ac
Author: Dipayan Bhowmick 
Authored: Mon Feb 13 18:59:11 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Feb 13 18:59:54 2017 +0530

--
 .../resources/ui/app/components/create-table.js |  6 +++-
 .../resources/ui/app/configs/file-format.js |  4 ++-
 .../resources/ui/app/controllers/messages.js| 30 
 .../ui/app/controllers/messages/message.js  | 31 
 .../app/helpers/alert-message-context-class.js  | 27 ++
 .../ui/app/helpers/alert-message-icon-class.js  | 37 
 .../resources/ui/app/helpers/shorten-text.js| 32 +
 .../main/resources/ui/app/mixins/ui-logger.js   | 15 
 .../main/resources/ui/app/routes/databases.js   | 12 ---
 .../databases/database/tables/new-database.js   | 15 
 .../app/routes/databases/database/tables/new.js |  8 +++--
 .../routes/databases/database/tables/table.js   |  8 +++--
 .../databases/database/tables/table/edit.js | 16 -
 .../databases/database/tables/table/rename.js   | 15 
 .../src/main/resources/ui/app/routes/jobs.js|  3 --
 .../main/resources/ui/app/routes/settings.js| 10 +++---
 .../resources/ui/app/services/alert-messages.js | 13 ---
 .../ui/app/templates/databases-loading.hbs  | 21 +++
 .../databases/database/tables-loading.hbs   | 24 +
 .../databases/database/tables/table-loading.hbs | 21 +++
 .../resources/ui/app/templates/jobs-loading.hbs | 20 +++
 .../resources/ui/app/templates/messages.hbs | 14 +++-
 .../ui/app/templates/messages/message.hbs   |  6 ++--
 .../ui/app/templates/savedqueries-loading.hbs   | 21 +++
 .../ui/app/templates/settings-loading.hbs   | 21 +++
 .../resources/ui/app/templates/udfs-loading.hbs | 21 +++
 .../src/main/resources/ui/config/environment.js |  2 +-
 27 files changed, 387 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6c4cbc4f/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
index f31d37f..670ebd7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/create-table.js
@@ -18,13 +18,17 @@
 
 import Ember from 'ember';
 import Helper from '../configs/helpers';
+import FileFormats from '../configs/file-format';
 
 export default Ember.Component.extend({
   init() {
 this._super(...arguments);
+let defaultFileFormat = FileFormats.findBy('default', true);
 this.set('columns', Ember.A());
 this.set('properties', []);
-this.set('settings', {});
+this.set('settings', {
+  fileFormat: { type: defaultFileFormat.name}
+});
 this.set('shouldAddBuckets', null);
 this.set('settingErrors', []);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/6c4cbc4f/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js 
b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
index 4042b63..afcba6e 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/configs/file-format.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-export default [
+let fileFormats = [
   {name: "SEQUENCEFILE", default: false, custom: false},
   {name: "TEXTFILE", default: false, custom: false},
   {name: "RCFILE", default: false, custom: false},
@@ -24,3 +24,5 @@ export default [
   {name: "AVRO", default: false, custom: false},
   {name: "CUSTOM SerDe", default: false, custom: true},
 ];
+
+export default fileFormats;

http://git-wip-us.apache.org/repos/asf/ambari/blob/6c4cbc4f/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/messages.js 

[25/50] [abbrv] ambari git commit: AMBARI-19962 Clicking on the login button (or hitting page refresh) to seeing the dashboard takes a while on a 1000-node cluster. (atkach)

[ncole]

AMBARI-19962 Clicking on the login button (or hitting page refresh) to seeing 
the dashboard takes a while on a 1000-node cluster. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8a99618
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8a99618
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8a99618

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: e8a9961841e0eaac2b471526068afabf37d10a35
Parents: fe1704e
Author: Andrii Tkach 
Authored: Fri Feb 10 17:59:58 2017 +0200
Committer: Andrii Tkach 
Committed: Fri Feb 10 21:37:29 2017 +0200

--
 ambari-web/app/router.js  | 37 ++
 ambari-web/app/utils/ajax/ajax.js |  2 +-
 2 files changed, 30 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8a99618/ambari-web/app/router.js
--
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index d671e86..df54303 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -256,16 +256,35 @@ App.Router = Em.Router.extend({
 
   displayLoginName: Em.computed.truncate('loginName', 10, 10),
 
+  /**
+   * @type {$.ajax|null}
+   */
+  clusterDataRequest: null,
+
+  /**
+   * If request was already sent on login then use saved clusterDataRequest 
and don't make second call
+   * @returns {$.ajax}
+   */
+  getClusterDataRequest: function() {
+var clusterDataRequest = this.get('clusterDataRequest');
+if (clusterDataRequest) {
+  this.set('clusterDataRequest', null);
+  return clusterDataRequest;
+} else {
+  return App.ajax.send({
+name: 'router.login.clusters',
+sender: this,
+success: 'onAuthenticationSuccess',
+error: 'onAuthenticationError'
+  });
+}
+  },
+
   getAuthenticated: function () {
 var dfd = $.Deferred();
 var self = this;
 var auth = App.db.getAuthenticated();
-App.ajax.send({
-  name: 'router.login.clusters',
-  sender: this,
-  success: 'onAuthenticationSuccess',
-  error: 'onAuthenticationError'
-}).complete(function (xhr) {
+this.getClusterDataRequest().complete(function (xhr) {
   if (xhr.state() === 'resolved') {
 // if server knows the user and user authenticated by UI
 if (auth) {
@@ -535,12 +554,12 @@ App.Router = Em.Router.extend({
   this.loginGetClustersSuccessCallback(self.get('clusterData'), {}, 
requestData);
 }
 else {
-  App.ajax.send({
+  this.set('clusterDataRequest', App.ajax.send({
 name: 'router.login.clusters',
 sender: self,
 data: requestData,
 success: 'loginGetClustersSuccessCallback'
-  });
+  }));
 }
   },
 
@@ -584,6 +603,8 @@ App.Router = Em.Router.extend({
 router.transitionToAdminView();
   }
 }
+// set cluster name and security type
+App.router.get('clusterController').reloadSuccessCallback(clustersData);
 App.set('isPermissionDataLoaded', true);
 App.router.get('loginController').postLogin(true, true);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8a99618/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index e344128..ae3947f 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2290,7 +2290,7 @@ var urls = {
 mock: '/data/users/privileges_{userName}.json'
   },
   'router.login.clusters': {
-'real': '/clusters?fields=Clusters/provisioning_state',
+'real': 
'/clusters?fields=Clusters/provisioning_state,Clusters/security_type',
 'mock': '/data/clusters/info.json'
   },
   'router.login.message': {

[44/50] [abbrv] ambari git commit: AMBARI-19058. Perf: Deploy 3000 Agent cluster and find perf bugs. Part5.(vbrodetskyi)

[ncole]

AMBARI-19058. Perf: Deploy 3000 Agent cluster and find perf bugs. 
Part5.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7eafd59
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7eafd59
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7eafd59

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: a7eafd59db2f9771b9e2b08d6a71406e05309b5c
Parents: b8176ff
Author: Vitaly Brodetskyi 
Authored: Mon Feb 13 14:10:21 2017 +0200
Committer: Vitaly Brodetskyi 
Committed: Mon Feb 13 14:10:21 2017 +0200

--
 .../resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml   | 2 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7eafd59/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
index 4dbd2bb..059deff 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
@@ -41,7 +41,7 @@
   
 
 
-  FAKEZOOKEEPER/FAKEZOOKEEPER_SERVER
+  ZOOKEEPER/ZOOKEEPER_SERVER
   cluster
   
 true

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7eafd59/contrib/utils/perf/deploy-gce-perf-cluster.py
--
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py 
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index 6364122..7431ae9 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -338,7 +338,10 @@ def create_server_script(server_host_name):
   "sed -i -f 
/home/ambari/ambari-server/src/main/resources/stacks/PERF/install_packages.sed 
/var/lib/ambari-agent/cache/custom_actions/scripts/install_packages.py\n" + \
   "\n" + \
   "\n" + \
-  "yum install mysql-connector-java* -y\n" + \
+  "cd /; wget 
http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40.jar;\n;
 + \
+  "mkdir /usr/share/java; chmod 777 /usr/share/java;" + \
+  "cp mysql-connector-java-5.1.40.jar /usr/share/java/; chmod 777 
/usr/share/java/mysql-connector-java-5.1.40.jar;\n" + \
+  "ln -s /usr/share/java/mysql-connector-java-5.1.40.jar 
/usr/share/java/mysql-connector-java.jar;\n" + \
   "cd /etc/yum.repos.d/; wget 
http://repo.mysql.com/mysql-community-release-el6-5.noarch.rpm; rpm -ivh 
mysql-community-release-el6-5.noarch.rpm;" + \
   "yum clean all; yum install mysql-server -y\n" + \
   "sed -i -e 
's/mysqld]/mysqld]\\nmax_allowed_packet=1024M\\njoin_buffer_size=512M\\nsort_buffer_size=128M\\nread_rnd_buffer_size=128M\\ninnodb_buffer_pool_size=16G"
 \

[23/50] [abbrv] ambari git commit: AMBARI-19904. Upgrade: Package Install stuck in Installing state forever. (stoader)

[ncole]

AMBARI-19904. Upgrade: Package Install stuck in Installing state forever. 
(stoader)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33caec24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33caec24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33caec24

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 33caec24a8742666a7190f38f5ebd71c54b2a405
Parents: a0ba7fb
Author: Toader, Sebastian 
Authored: Fri Feb 10 18:38:37 2017 +0100
Committer: Toader, Sebastian 
Committed: Fri Feb 10 18:38:37 2017 +0100

--
 .../server/actionmanager/ActionDBAccessor.java  |  5 +-
 .../actionmanager/ActionDBAccessorImpl.java |  6 +-
 .../server/actionmanager/ActionScheduler.java   | 15 ++---
 .../actionmanager/TestActionScheduler.java  | 65 +++-
 4 files changed, 66 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
index 8aef70d..217fe0a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.CommandReport;
 import org.apache.ambari.server.agent.ExecutionCommand;
+import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
 import org.apache.ambari.server.orm.entities.RequestEntity;
 
 public interface ActionDBAccessor {
@@ -58,8 +59,10 @@ public interface ActionDBAccessor {
* Abort all outstanding operations associated with the given request. This
* method uses the {@link HostRoleStatus#SCHEDULED_STATES} to determine which
* {@link HostRoleCommand} instances to abort.
+   *
+   * Returns the list of the aborted operations.
*/
-  public void abortOperation(long requestId);
+  public Collection abortOperation(long requestId);
 
   /**
* Mark the task as to have timed out

http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 7837a7b..7881a4b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -202,7 +202,7 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
* {@inheritDoc}
*/
   @Override
-  public void abortOperation(long requestId) {
+  public Collection abortOperation(long requestId) {
 long now = System.currentTimeMillis();
 
 endRequest(requestId);
@@ -226,8 +226,10 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
 
 // no need to merge if there's nothing to merge
 if (!commands.isEmpty()) {
-  hostRoleCommandDAO.mergeAll(commands);
+  return hostRoleCommandDAO.mergeAll(commands);
 }
+
+return Collections.emptyList();
   }
 
   /* (non-Javadoc)

http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index fa2ad4f..680c0a6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -929,15 +929,16 @@ class ActionScheduler implements Runnable {
 ExecutionCommand c = wrapper.getExecutionCommand();
 transitionToFailedState(stage.getClusterName(), c.getServiceName(),
 c.getRole(), hostName, now, true);
-if (c.getRoleCommand().equals(RoleCommand.ACTIONEXECUTE)) {
-  String clusterName = c.getClusterName();
-  processActionDeath(clusterName,
-  c.getHostname(),
-  

[32/50] [abbrv] ambari git commit: AMBARI-19958. Hive View 2.0 - deleting a saved query is buggy (pallavkul)

[ncole]

AMBARI-19958. Hive View 2.0 - deleting a saved query is buggy (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23642958
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23642958
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23642958

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 23642958208fe6b3148ac157753edb13b6d31347
Parents: d96d209
Author: pallavkul 
Authored: Sat Feb 11 16:58:22 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 16:58:22 2017 +0530

--
 .../resources/ui/app/adapters/saved-query.js|  2 +-
 .../resources/ui/app/components/query-editor.js |  2 +-
 .../resources/ui/app/controllers/saved-query.js | 22 +
 .../resources/ui/app/routes/queries/query.js| 11 +++--
 .../resources/ui/app/routes/savedqueries.js | 50 +++-
 .../resources/ui/app/services/saved-queries.js  |  5 +-
 .../ui/app/templates/queries/query.hbs  |  2 +-
 .../resources/ui/app/templates/savedqueries.hbs |  8 ++--
 8 files changed, 75 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js 
b/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
index 5ee757b..a25adc7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
@@ -21,6 +21,6 @@ import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
   buildURL(){
-return this._super(...arguments).replace('/resources','') + 
'/savedQueries/';
+return this._super(...arguments).replace('/resources','');
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
index 7bfe223..3175a35 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
@@ -101,7 +101,7 @@ export default Ember.Component.extend({
   }
 }
 
-this.sendAction('updateQuery');
+this.sendAction('updateQuery', query);
 
 
   }.observes('query'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js 
b/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
new file mode 100644
index 000..dc99fd1
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index dcf27b4..4f60229 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -114,7 +114,6 @@ export default Ember.Route.extend({
 controller.set('isVisualExplainQuery', false);
 

[03/50] [abbrv] ambari git commit: AMBARI-19887 : Add AMS and Grafana to PERF cluster (Addendum patch) (avijayan)

[ncole]

AMBARI-19887 : Add AMS and Grafana to PERF cluster (Addendum patch) (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7abf4e63
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7abf4e63
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7abf4e63

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 7abf4e63f093d55c793b451d0435fc485757e6c7
Parents: 3c0f3c4
Author: Aravindan Vijayan 
Authored: Thu Feb 9 13:45:33 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Feb 9 13:45:33 2017 -0800

--
 .../0.1.0/package/scripts/params.py |  6 +++---
 .../PERF/1.0/hooks/before-ANY/scripts/hook.py   |  6 --
 .../PERF/1.0/hooks/before-ANY/scripts/params.py |  2 ++
 .../1.0/hooks/before-INSTALL/scripts/hook.py|  1 +
 .../1.0/hooks/before-RESTART/scripts/hook.py|  1 +
 .../1.0/services/AMBARI_METRICS/metainfo.xml| 20 
 6 files changed, 31 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7abf4e63/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index dcc26b7..fcfe088 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -67,9 +67,9 @@ if not is_ams_distributed and len(ams_collector_list) > 1:
 
 if 'cluster-env' in config['configurations'] and \
 'metrics_collector_vip_host' in config['configurations']['cluster-env']:
-  metric_collector_host = 
config['configurations']['cluster-env']['metrics_collector_vip_host']
-else:
-  metric_collector_host = 
select_metric_collector_hosts_from_hostnames(ams_collector_hosts)
+  ams_collector_hosts = 
config['configurations']['cluster-env']['metrics_collector_vip_host']
+
+metric_collector_host = 
select_metric_collector_hosts_from_hostnames(ams_collector_hosts)
 
 random_metric_collector_host = 
select_metric_collector_hosts_from_hostnames(ams_collector_hosts)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7abf4e63/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/hook.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/hook.py
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/hook.py
index ef409e2..d707c3b 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/hook.py
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/hook.py
@@ -28,8 +28,10 @@ class BeforeAnyHook(Hook):
 env.set_params(params)
 
 #For AMS.
-setup_users()
-setup_java()
+if params.service_name == 'AMBARI_METRICS':
+  setup_users()
+  if params.component_name == 'METRICS_COLLECTOR':
+setup_java()
 
 if __name__ == "__main__":
   BeforeAnyHook().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/7abf4e63/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/params.py
index dee9d07..2c2c901 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-ANY/scripts/params.py
@@ -39,4 +39,6 @@ artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")
 jdk_location = config['hostLevelParams']['jdk_location']
 java_version = expect("/hostLevelParams/java_version", int)
 
+service_name = config["serviceName"]
+component_name = config["role"]
 sudo = AMBARI_SUDO_BINARY
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/7abf4e63/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-INSTALL/scripts/hook.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-INSTALL/scripts/hook.py
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-INSTALL/scripts/hook.py
index f030cfc..833fdbc 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/hooks/before-INSTALL/scripts/hook.py
+++ 

[42/50] [abbrv] ambari git commit: AMBARI-19919: spark/livy (1.x) should not be configured in Zeppelin's interpreter if they are not installed (Prabhjyot Singh via r-kamath)

[ncole]

AMBARI-19919: spark/livy (1.x) should not be configured in Zeppelin's 
interpreter if they are not installed (Prabhjyot Singh via r-kamath)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9060614
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9060614
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9060614

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: a9060614ffe9cd6812eb8ff9cbb6fd81572f66e2
Parents: b695bf2
Author: Renjith Kamath 
Authored: Mon Feb 13 13:27:06 2017 +0530
Committer: Renjith Kamath 
Committed: Mon Feb 13 13:29:00 2017 +0530

--
 .../package/scripts/livy2_config_template.py| 107 +++
 .../0.6.0.2.5/package/scripts/master.py |  42 ++--
 .../0.6.0.2.5/package/scripts/params.py |   8 ++
 3 files changed, 147 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9060614/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/livy2_config_template.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/livy2_config_template.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/livy2_config_template.py
new file mode 100644
index 000..71d3817
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/livy2_config_template.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+"""
+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.
+
+"""
+
+template = '''
+{
+  "id": "2C8A4SZ9T_livy2",
+  "status": "READY",
+  "group": "livy",
+  "name": "livy2",
+  "properties": {
+"zeppelin.livy.keytab": "",
+"zeppelin.livy.spark.sql.maxResult": "1000",
+"livy.spark.executor.instances": "",
+"livy.spark.executor.memory": "",
+"livy.spark.dynamicAllocation.enabled": "",
+"livy.spark.dynamicAllocation.cachedExecutorIdleTimeout": "",
+"livy.spark.dynamicAllocation.initialExecutors": "",
+"zeppelin.livy.session.create_timeout": "120",
+"livy.spark.driver.memory": "",
+"zeppelin.livy.displayAppInfo": "false",
+"livy.spark.jars.packages": "",
+"livy.spark.dynamicAllocation.maxExecutors": "",
+"zeppelin.livy.concurrentSQL": "false",
+"zeppelin.livy.principal": "",
+"livy.spark.executor.cores": "",
+"zeppelin.livy.url": "http://localhost:8998;,
+"zeppelin.livy.pull_status.interval.millis": "1000",
+"livy.spark.driver.cores": "",
+"livy.spark.dynamicAllocation.minExecutors": ""
+  },
+  "interpreterGroup": [
+{
+  "class": "org.apache.zeppelin.livy.LivySparkInterpreter",
+  "editor": {
+"editOnDblClick": false,
+"language": "scala"
+  },
+  "name": "spark",
+  "defaultInterpreter": false
+},
+{
+  "class": "org.apache.zeppelin.livy.LivySparkSQLInterpreter",
+  "editor": {
+"editOnDblClick": false,
+"language": "sql"
+  },
+  "name": "sql",
+  "defaultInterpreter": false
+},
+{
+  "class": "org.apache.zeppelin.livy.LivyPySparkInterpreter",
+  "editor": {
+"editOnDblClick": false,
+"language": "python"
+  },
+  "name": "pyspark",
+  "defaultInterpreter": false
+  },
+{
+  "class": "org.apache.zeppelin.livy.LivyPySpark3Interpreter",
+  "editor": {
+"editOnDblClick": false,
+"language": "python"
+  },
+  "name": "pyspark3",
+  "defaultInterpreter": false
+},
+{
+  "class": "org.apache.zeppelin.livy.LivySparkRInterpreter",
+  "editor": {
+"editOnDblClick": false,
+"language": "r"
+  },
+  "name": "sparkr",
+  "defaultInterpreter": false
+}
+  ],
+  "dependencies": [],
+  "option": {
+"setPermission": false,
+"remote": true,
+"users": [],
+"isExistingProcess": false,
+"perUser": "scoped",
+"isUserImpersonate": false,
+

[16/50] [abbrv] ambari git commit: AMBARI-19956. Workflow Manager Flow Graph should show line transition to decision path and error node (Madhan Mohan Reddy via gauravn7).

[ncole]

AMBARI-19956. Workflow Manager Flow Graph should show line transition to 
decision path and error node (Madhan Mohan Reddy via gauravn7).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b15b6064
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b15b6064
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b15b6064

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b15b60646c3d8a0b39579718f48e0076c26a6142
Parents: 1339d52
Author: Gaurav Nagar 
Authored: Fri Feb 10 16:50:55 2017 +0530
Committer: Gaurav Nagar 
Committed: Fri Feb 10 16:50:55 2017 +0530

--
 .../resources/ui/app/components/job-details.js  | 43 
 1 file changed, 34 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b15b6064/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
index 6507c49..d1343b0 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
@@ -192,7 +192,7 @@ export default Ember.Component.extend({
 var dataNodes = [];
 var self=this;
 workflow.nodeVisitor.process(workflow.startNode, function(node) {
-  if (node.type === 'kill') {
+  if (node.type === 'kill' && !(node.forceRenderNode || 
self.getActionNode(node.name, node.type))) {
 return;
   }
   var nodeActionStatus = self.getActionStatus(node.name, node.type);
@@ -206,18 +206,28 @@ export default Ember.Component.extend({
   });
 if (node.transitions.length > 0) {
   node.transitions.forEach(function(tran){
-if (tran.targetNode.type === 'kill') {
-  return;
-}
 var transitionBorderColor;
 var actionNode = self.getActionNode(node.name, node.type);
-if (actionNode && (actionNode.transition===tran.targetNode.name 
||actionNode.transition==='*')){
-  transitionBorderColor = Constants.successfulFlowColor;//green
+if (tran.targetNode.type === 'kill' &&
+  !((actionNode && actionNode.transition===tran.targetNode.name) 
|| (node.isPlaceholder( {
+  return;
+}
+ if (tran.getTargetNode(true).isKillNode()  && !tran.isOnError()){
+  tran.targetNode.forceRenderNode = true;
+ }
+if (actionNode && (actionNode.transition===tran.targetNode.name 
||actionNode.transition==='*' || (tran.targetNode.isPlaceholder() && 
actionNode.transition===tran.getTargetNode(true).name))) {
+  transitionBorderColor = Constants.successfulFlowColor;
+  if (tran.targetNode.isPlaceholder()) {
+tran.targetNode.successfulFlow = true;
+  }
 }else{
-  transitionBorderColor = Constants.defaultFlowColor;//grey
+  transitionBorderColor = Constants.defaultFlowColor;
 }
 if (!actionNode){
-  transitionBorderColor = Constants.defaultFlowColor;//grey
+  transitionBorderColor = Constants.defaultFlowColor;
+  if (node.isPlaceholder() && node.successfulFlow) {
+transitionBorderColor = Constants.successfulFlowColor;
+  }
 }
 dataNodes.push(
   {
@@ -225,6 +235,7 @@ export default Ember.Component.extend({
   id: tran.sourceNodeId + '_to_' + tran.targetNode.id,
   source:tran.sourceNodeId,
   target: tran.targetNode.id,
+  transition: tran,
   borderColor: transitionBorderColor
 }
   }
@@ -268,6 +279,14 @@ export default Ember.Component.extend({
 }
   },
   {
+selector: 'node[type = "placeholder"]',
+style: {
+  width: 1,
+  height: 1,
+  label: ''
+}
+  },
+  {
 selector: 'node[shape = "roundrectangle"]',
 style: {
   width: 100,
@@ -294,7 +313,13 @@ export default Ember.Component.extend({
   width: 1,
   'line-color': 'data(borderColor)',
   'curve-style': 'bezier',
-   'target-arrow-shape': 'triangle',
+  'target-arrow-shape': function(target){
+if (target.data().transition && 
target.data().transition.getTargetNode(false) && 

[33/50] [abbrv] ambari git commit: AMBARI-19975. Hive2. Visual Explain -Show additional info when you click on a box, i.e. can drill down to get more info on operators. (pallavkul)

[ncole]

AMBARI-19975. Hive2. Visual Explain -Show additional info when you click on a 
box, i.e. can drill down to get more info on operators. (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d1253a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d1253a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d1253a6

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1d1253a6471113a78dd22faf453439ab13a19e48
Parents: 2364295
Author: pallavkul 
Authored: Sat Feb 11 17:06:43 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 17:06:43 2017 +0530

--
 .../ui/app/components/visual-explain-detail.js  | 31 +
 .../ui/app/components/visual-explain.js | 26 ++-
 .../resources/ui/app/routes/queries/query.js| 13 --
 .../src/main/resources/ui/app/styles/app.scss   | 49 
 .../components/visual-explain-detail.hbs| 29 
 .../app/templates/components/visual-explain.hbs |  5 ++
 6 files changed, 148 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
new file mode 100644
index 000..2c9ba00
--- /dev/null
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+  classNames:['visual-explain-detail-container'],
+
+  actions:{
+closeModal(){
+  this.sendAction('closeModal');
+}
+  }
+
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
index 6551974..6805bb8 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
@@ -20,8 +20,13 @@ import Ember from 'ember';
 import explain from '../utils/hive-explainer';
 
 export default Ember.Component.extend({
+
   visualExplainJson:'',
 
+  showDetailsModal: false,
+
+  explainDetailData: '',
+
   visualExplainInput: Ember.computed('visualExplainJson', function () {
 return this.get('visualExplainJson');
   }),
@@ -39,6 +44,7 @@ export default Ember.Component.extend({
   .attr('height', height);
 
 const container = svg.append('g');
+
 const zoom =
   d3.zoom()
 .scaleExtent([1 / 10, 4])
@@ -49,16 +55,34 @@ export default Ember.Component.extend({
   svg
 .call(zoom);
 
-const onRequestDetail = data => this.sendAction('showStepDetail', data);
+const onRequestDetail = data => this.set('explainDetailData', 
JSON.stringify( data, null, '  ') );
 
 explain(JSON.parse(this.get('visualExplainInput')), svg, container, zoom, 
onRequestDetail);
 
   },
 
+  click(event){
+
+if(this.get('explainDetailData') === ''){
+  return;
+}
+
+Ember.run.later(() => {
+  this.set('showDetailsModal', true);
+}, 100);
+  },
+
   actions:{
 expandQueryResultPanel(){
   this.sendAction('expandQueryResultPanel');
+},
+
+closeModal(){
+  this.set('showDetailsModal', false);
+  this.set('explainDetailData', '');
+  false;
 }
+
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js

[11/50] [abbrv] ambari git commit: AMBARI-19949. Hive View 2.0: Introduce validation for expression precision >= scale. (dipayanb)

[ncole]

AMBARI-19949. Hive View 2.0: Introduce validation for expression precision >= 
scale. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/232b585b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/232b585b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/232b585b

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 232b585bdd0350f5b2fb8c2c7ebf200cd3286fa7
Parents: 09e35e1
Author: Dipayan Bhowmick 
Authored: Fri Feb 10 15:09:29 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Fri Feb 10 15:10:17 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/models/column.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/232b585b/contrib/views/hive20/src/main/resources/ui/app/models/column.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/column.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/column.js
index 1d9ccce..f38309b 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/column.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/column.js
@@ -87,6 +87,8 @@ let Column = Ember.Object.extend(Ember.Copyable,{
 this.get('errors').pushObject({type: 'precision', error: "Precision 
can only be a number"});
   } else if(this.get('precision') <= 0) {
 this.get('errors').pushObject({type: 'precision', error: "Precision 
can only be greater than zero"});
+  } else if(this.get('type.hasScale') && this.get('scale') && 
(this.get('precision') < this.get('scale'))) {
+this.get('errors').pushObject({type: 'precision', error: "Precision 
can only be greater than scale"});
   }
 
 }

[45/50] [abbrv] ambari git commit: AMBARI-19982 Admin View: issues with Users/Groups table filters. (ababiichuk)

[ncole]

AMBARI-19982 Admin View: issues with Users/Groups table filters. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6445ac8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6445ac8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6445ac8

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: a6445ac838cc2b54e5ee5f943d4fa22a72fc7ad3
Parents: a7eafd5
Author: ababiichuk 
Authored: Mon Feb 13 13:56:29 2017 +0200
Committer: ababiichuk 
Committed: Mon Feb 13 14:45:50 2017 +0200

--
 .../controllers/clusters/UserAccessListCtrl.js  |  5 +-
 .../clusters/UserAccessListCtrl_test.js | 90 
 2 files changed, 1 insertion(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6445ac8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index 3737414..5dc6bd3 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -314,8 +314,6 @@ function($scope, $location, Cluster, $modal, $rootScope, 
$routeParams, Permissio
 
   $scope.clearFilters = function() {
 $scope.currentNameFilter = '';
-$scope.isUserActive = true;
-$scope.currentTypeFilter = $scope.typeFilterOptions[0];
 $scope.currentRoleFilter = $scope.roleFilterOptions[0];
 $scope.resetPagination();
   };
@@ -325,8 +323,7 @@ function($scope, $location, Cluster, $modal, $rootScope, 
$routeParams, Permissio
 
   $scope.$watch(
 function (scope) {
-  return Boolean(scope.currentNameFilter || (scope.currentTypeFilter && 
scope.currentTypeFilter.value)
-|| (scope.currentRoleFilter && scope.currentRoleFilter.value));
+  return Boolean(scope.currentNameFilter || (scope.currentRoleFilter && 
scope.currentRoleFilter.value));
 },
 function (newValue, oldValue, scope) {
   scope.isNotEmptyFilter = newValue;

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6445ac8/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
index 42fb453..14c0975 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
@@ -77,10 +77,6 @@ describe('#Cluster', function () {
 value: 'CLUSTER.USER'
   }
 ];
-scope.typeFilterOptions = [
-  {label: $t('common.user'), value: 'USER'},
-  {label: $t('common.group'), value: 'GROUP'}
-];
 scope.currentRoleFilter = scope.roleFilterOptions[1];
 scope.clearFilters();
 expect(scope.currentNameFilter).toEqual('');
@@ -98,16 +94,12 @@ describe('#Cluster', function () {
   var cases = [
 {
   currentNameFilter: '',
-  currentTypeFilter: null,
   currentRoleFilter: null,
   isNotEmptyFilter: false,
   title: 'no filters'
 },
 {
   currentNameFilter: '',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -116,9 +108,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: 'a',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -127,9 +116,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: '0',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -138,20 +124,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: '',
-  currentTypeFilter: {
-value: 'GROUP'
-  },
-  currentRoleFilter: {
-value: ''
-  },
-  isNotEmptyFilter: true,
-  title: 'type filter'
-},
-{
- 

[49/50] [abbrv] ambari git commit: AMBARI-19970 : AMS graphs are not present on cluster with SSL (Commit 2). (avijayan)

[ncole]

AMBARI-19970 : AMS graphs are not present on cluster with SSL (Commit 2). 
(avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cb9a6ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cb9a6ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cb9a6ad

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 7cb9a6ad53a926f055c5bf78ac2a9a8bd1668d78
Parents: d252665
Author: Aravindan Vijayan 
Authored: Mon Feb 13 10:56:46 2017 -0800
Committer: Aravindan Vijayan 
Committed: Mon Feb 13 10:56:46 2017 -0800

--
 .../0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb9a6ad/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 8c20f2b..8c6f86f 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -42,16 +42,19 @@ 
hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.period=30
 hbase.collector.hosts={{ams_collector_hosts}}
 hbase.port={{metric_collector_port}}
+hbase.protocol={{metric_collector_protocol}}
 
 jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 jvm.period=30
 jvm.collector.hosts={{ams_collector_hosts}}
 jvm.port={{metric_collector_port}}
+jvm.protocol={{metric_collector_protocol}}
 
 rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 rpc.period=30
 rpc.collector.hosts={{ams_collector_hosts}}
 rpc.port={{metric_collector_port}}
+rpc.protocol={{metric_collector_protocol}}
 
 
*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
@@ -60,6 +63,7 @@ hbase.sink.timeline.period={{metrics_collection_period}}
 hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}}
 hbase.sink.timeline.port={{metric_collector_port}}
+hbase.sink.timeline.protocol={{metric_collector_protocol}}
 hbase.sink.timeline.serviceName-prefix=ams
 
 # HTTPS properties

[31/50] [abbrv] ambari git commit: AMBARI-19667. Hive View 2.0: Editor should be stretchable by dragging (pallavkul)

[ncole]

AMBARI-19667. Hive View 2.0: Editor should be stretchable by dragging 
(pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d96d209c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d96d209c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d96d209c

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d96d209c1ad8aeefd9ab1c02fbe621c7dfd02ffa
Parents: b00cf74
Author: pallavkul 
Authored: Sat Feb 11 08:46:11 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 08:46:11 2017 +0530

--
 .../src/main/resources/ui/app/components/query-editor.js| 8 
 .../views/hive20/src/main/resources/ui/app/styles/app.scss  | 9 +
 contrib/views/hive20/src/main/resources/ui/bower.json   | 1 +
 .../views/hive20/src/main/resources/ui/ember-cli-build.js   | 2 ++
 4 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d96d209c/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
index 27d43d5..7bfe223 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
@@ -74,6 +74,14 @@ export default Ember.Component.extend({
   });
 });
 
+this.$('.CodeMirror').resizable({
+  handles: 's',
+
+  resize: function () {
+Ember.run.debounce(this, updateSize, 150);
+  }
+}).find('.ui-resizable-s').addClass('grip fa fa-reorder');
+
 
   }.on('didInsertElement'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d96d209c/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index 0dae396..1dc86d7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -223,6 +223,15 @@ pre {
   overflow-y: scroll;
 }
 
+.grip {
+  height: 20px;
+  border: 0 1px 1px solid #ddd;
+  background-color: #f5f5f5;
+  color: #bbb;
+  text-align: center;
+  font-size: inherit;
+}
+
 .hv-dropdown {
   position: absolute;
   .dropdown-menu {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d96d209c/contrib/views/hive20/src/main/resources/ui/bower.json
--
diff --git a/contrib/views/hive20/src/main/resources/ui/bower.json 
b/contrib/views/hive20/src/main/resources/ui/bower.json
index f4d9aa0..9fa7076 100644
--- a/contrib/views/hive20/src/main/resources/ui/bower.json
+++ b/contrib/views/hive20/src/main/resources/ui/bower.json
@@ -6,6 +6,7 @@
 "ember-cli-shims": "~0.1.1",
 "ember-qunit-notifications": "0.1.0",
 "font-awesome": "~4.5.0",
+"jquery-ui": "~1.12.1",
 "codemirror": "~5.15.0",
 "bootstrap-treeview": "~1.2.0",
 "blob": "*"

http://git-wip-us.apache.org/repos/asf/ambari/blob/d96d209c/contrib/views/hive20/src/main/resources/ui/ember-cli-build.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/ember-cli-build.js 
b/contrib/views/hive20/src/main/resources/ui/ember-cli-build.js
index 10e0402..d53cdac 100644
--- a/contrib/views/hive20/src/main/resources/ui/ember-cli-build.js
+++ b/contrib/views/hive20/src/main/resources/ui/ember-cli-build.js
@@ -55,6 +55,8 @@ module.exports = function(defaults) {
app.import('bower_components/codemirror/addon/hint/show-hint.js');
app.import('bower_components/d3/d3.js');
app.import('bower_components/codemirror/lib/codemirror.css');
+   app.import('bower_components/jquery-ui/jquery-ui.js');
+   app.import('bower_components/jquery-ui/themes/base/jquery-ui.css');
app.import('bower_components/codemirror/addon/hint/show-hint.css');
 
   /*

[29/50] [abbrv] ambari git commit: AMBARI-19886. Update ambari managed llap queue to set preemption policy. (Siddharth Seth via Swapan Shridhar).

[ncole]

AMBARI-19886. Update ambari managed llap queue to set preemption policy. 
(Siddharth Seth via Swapan Shridhar).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7d0e781
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7d0e781
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7d0e781

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: e7d0e781b3506d20806f521b30ce4629e67641f5
Parents: f4c8384
Author: Swapan Shridhar 
Authored: Fri Feb 10 16:10:19 2017 -0800
Committer: Swapan Shridhar 
Committed: Fri Feb 10 16:10:25 2017 -0800

--
 .../stacks/HDP/2.5/services/stack_advisor.py| 15 +++-
 .../stacks/2.5/common/test_stack_advisor.py | 36 +---
 2 files changed, 45 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e7d0e781/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 9fe8fc3..4de9a41 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -1532,13 +1532,18 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   elif prop == 
'yarn.scheduler.capacity.root.default.maximum-capacity':
 updated_cap_sched_configs_str = updated_cap_sched_configs_str \
 + prop + "=" + 
adjusted_default_queue_cap + "\n"
+  elif prop == 'yarn.scheduler.capacity.root.ordering-policy':
+# Don't put this in again. We're re-writing the llap section.
+pass
   elif prop.startswith('yarn.') and '.llap.' not in prop:
 updated_cap_sched_configs_str = updated_cap_sched_configs_str 
+ prop + "=" + val + "\n"
 
   # Now, append the 'llap' queue related properties
-  updated_cap_sched_configs_str += 
"""yarn.scheduler.capacity.root.{0}.user-limit-factor=1
+  updated_cap_sched_configs_str += 
"""yarn.scheduler.capacity.root.ordering-policy=priority-utilization
+yarn.scheduler.capacity.root.{0}.user-limit-factor=1
 yarn.scheduler.capacity.root.{0}.state=RUNNING
 yarn.scheduler.capacity.root.{0}.ordering-policy=fifo
+yarn.scheduler.capacity.root.{0}.priority=10
 yarn.scheduler.capacity.root.{0}.minimum-user-limit-percent=100
 yarn.scheduler.capacity.root.{0}.maximum-capacity={1}
 yarn.scheduler.capacity.root.{0}.capacity={1}
@@ -1560,13 +1565,18 @@ 
yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu
 putCapSchedProperty(prop, adjusted_default_queue_cap)
   elif prop == 
'yarn.scheduler.capacity.root.default.maximum-capacity':
 putCapSchedProperty(prop, adjusted_default_queue_cap)
+  elif prop == 'yarn.scheduler.capacity.root.ordering-policy':
+# Don't put this in again. We're re-writing the llap section.
+pass
   elif prop.startswith('yarn.') and '.llap.' not in prop:
 putCapSchedProperty(prop, val)
 
   # Add new 'llap' queue related configs.
+  putCapSchedProperty("yarn.scheduler.capacity.root.ordering-policy", 
"priority-utilization")
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".user-limit-factor", "1")
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".state", "RUNNING")
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".ordering-policy", "fifo")
+  putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".priority", "10")
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".minimum-user-limit-percent", "100")
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".maximum-capacity", llap_queue_cap_perc)
   putCapSchedProperty("yarn.scheduler.capacity.root." + 
llap_queue_name + ".capacity", llap_queue_cap_perc)
@@ -1634,6 +1644,9 @@ 
yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu
 # Set 'default' max. capacity back to maximum val
 updated_default_queue_configs = updated_default_queue_configs \
 + prop + "="+DEFAULT_MAX_CAPACITY 
+ "\n"
+  elif prop == 'yarn.scheduler.capacity.root.ordering-policy':
+# Don't set this property. The default will be picked up.
+

[10/50] [abbrv] ambari git commit: AMBARI-19940. Hive View 2.0: Remove aria tags from templates. (dipayanb)

[ncole]

AMBARI-19940. Hive View 2.0: Remove aria tags from templates. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09e35e1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09e35e1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09e35e1e

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 09e35e1e3de0206edbf139ed5cbf9a33b470c7f1
Parents: 2ce1042
Author: Dipayan Bhowmick 
Authored: Fri Feb 10 15:06:13 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Fri Feb 10 15:06:46 2017 +0530

--
 .../main/resources/ui/app/templates/components/alert-message.hbs | 2 +-
 .../main/resources/ui/app/templates/components/column-item.hbs   | 2 +-
 .../resources/ui/app/templates/components/confirm-dialog.hbs | 2 +-
 .../main/resources/ui/app/templates/components/export-result.hbs | 2 +-
 .../resources/ui/app/templates/components/hdfs-viewer-modal.hbs  | 2 +-
 .../main/resources/ui/app/templates/components/info-dialog.hbs   | 2 +-
 .../resources/ui/app/templates/components/query-result-table.hbs | 4 ++--
 .../hive20/src/main/resources/ui/app/templates/databases.hbs | 2 +-
 .../ui/app/templates/databases/database/tables/table.hbs | 4 ++--
 .../hive20/src/main/resources/ui/app/templates/queries/query.hbs | 4 ++--
 .../hive20/src/main/resources/ui/app/templates/savedqueries.hbs  | 4 ++--
 .../hive20/src/main/resources/ui/app/templates/service-check.hbs | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09e35e1e/contrib/views/hive20/src/main/resources/ui/app/templates/components/alert-message.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/alert-message.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/alert-message.hbs
index ce8d941..2f114f9 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/alert-message.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/alert-message.hbs
@@ -17,7 +17,7 @@
 }}
 
 
-  
+  
   
 {{#fa-stack size=2}}
   {{fa-icon "circle-thin" stack=2}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/09e35e1e/contrib/views/hive20/src/main/resources/ui/app/templates/components/column-item.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/column-item.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/column-item.hbs
index b649d5b..21418c1 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/column-item.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/column-item.hbs
@@ -75,7 +75,7 @@
   container-class="modal-dialog"}}
   
 
-  
+  
   {{fa-icon "cog" size="lg"}} Advance Column 
Options
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/09e35e1e/contrib/views/hive20/src/main/resources/ui/app/templates/components/confirm-dialog.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/confirm-dialog.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/confirm-dialog.hbs
index d940237..b62e98b 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/confirm-dialog.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/confirm-dialog.hbs
@@ -24,7 +24,7 @@
   
 
   {{#if closable}}
-
+
   {{/if}}
   {{#if titleIcon}}{{fa-icon titleIcon 
size="lg"}}{{/if}} {{title}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/09e35e1e/contrib/views/hive20/src/main/resources/ui/app/templates/components/export-result.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/export-result.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/export-result.hbs
index 0b462cb..69991f1 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/export-result.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/export-result.hbs
@@ -23,7 +23,7 @@
   container-class="modal-dialog"}}
   
 
-
+
 
 
   {{#if labelIcon}}{{fa-icon labelIcon size="lg"}}{{/if}} 
{{label}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/09e35e1e/contrib/views/hive20/src/main/resources/ui/app/templates/components/hdfs-viewer-modal.hbs

[01/50] [abbrv] ambari git commit: Updated team page. (yusaku)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-12556 d222f572e -> 341cb1247


Updated team page. (yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d5755ba1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d5755ba1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d5755ba1

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d5755ba15a979aa94fd53338be27d2206f108065
Parents: 6addaf5
Author: Yusaku Sako 
Authored: Thu Feb 9 11:53:15 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 9 11:53:15 2017 -0800

--
 docs/pom.xml | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5755ba1/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index a128775..db907d1 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -151,6 +151,18 @@
 
 
 
+adoroszlai
+Attila Doroszlai
+adorosz...@apache.org
++1
+
+Committer
+
+
+Hortonworks
+
+
+
 ajit
 Ajit Kumar
 a...@apache.org
@@ -740,7 +752,7 @@
 Committer
 
 
-Teraware
+ITRenew Inc
 
 
 
@@ -1271,7 +1283,7 @@
 
 
   Vivek Ratnavel Subramanian
-  The Ohio State University
+  Hortonworks
 
 
   Pramod Thangali

[ambari] Git Push Summary

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-12556 [created] d222f572e

[19/50] [abbrv] ambari git commit: AMBARI-19884. Set a higher value of num aggregated files per container - HDP stack, YARN (Siddharth Seth via smohanty)

[ncole]

AMBARI-19884. Set a higher value of num aggregated files per container - HDP 
stack, YARN (Siddharth Seth via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d5100632
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d5100632
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d5100632

Branch: refs/heads/branch-dev-patch-upgrade
Commit: d5100632624a671512ea44e6ad8f6ee9df3dba24
Parents: d6e0b26
Author: Sumit Mohanty 
Authored: Sat Feb 11 16:09:15 2017 -0800
Committer: Sumit Mohanty 
Committed: Sat Feb 11 16:09:48 2017 -0800

--
 .../HDP/2.5/services/YARN/configuration/yarn-site.xml   | 6 ++
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml| 5 +
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml  | 9 -
 .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml  | 1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
index 90b2243..b6fadcb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
@@ -47,6 +47,12 @@
 
   
   
+yarn.nodemanager.log-aggregation.num-log-files-per-app
+336
+The number of files to retain per container when continuous 
log aggregation is used
+
+  
+  
 yarn.nodemanager.container-metrics.unregister-delay-ms
 6
 The delay time ms to unregister container metrics after 
completion.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 100df8f..15837df 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -146,6 +146,11 @@
 
to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled"
 default-value="false"/>
 
+
+  yarn-site
+  
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 6e92141..8c7a9b1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -299,12 +299,19 @@
   
 
   
-  
+  
 
   Updating underutilized_preemption setting
 
   
 
+  
+  
+
+  Updating log aggregation retained files setting
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5100632/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index bc68754..b83525a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -670,6 +670,7 @@
   
   
   
+  
 
 
 

[14/50] [abbrv] ambari git commit: AMBARI-19958. Hive View 2.0 - deleting a saved query is buggy (pallavkul)

[ncole]

AMBARI-19958. Hive View 2.0 - deleting a saved query is buggy (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23642958
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23642958
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23642958

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 23642958208fe6b3148ac157753edb13b6d31347
Parents: d96d209
Author: pallavkul 
Authored: Sat Feb 11 16:58:22 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 16:58:22 2017 +0530

--
 .../resources/ui/app/adapters/saved-query.js|  2 +-
 .../resources/ui/app/components/query-editor.js |  2 +-
 .../resources/ui/app/controllers/saved-query.js | 22 +
 .../resources/ui/app/routes/queries/query.js| 11 +++--
 .../resources/ui/app/routes/savedqueries.js | 50 +++-
 .../resources/ui/app/services/saved-queries.js  |  5 +-
 .../ui/app/templates/queries/query.hbs  |  2 +-
 .../resources/ui/app/templates/savedqueries.hbs |  8 ++--
 8 files changed, 75 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js 
b/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
index 5ee757b..a25adc7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/adapters/saved-query.js
@@ -21,6 +21,6 @@ import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
   buildURL(){
-return this._super(...arguments).replace('/resources','') + 
'/savedQueries/';
+return this._super(...arguments).replace('/resources','');
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
index 7bfe223..3175a35 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/query-editor.js
@@ -101,7 +101,7 @@ export default Ember.Component.extend({
   }
 }
 
-this.sendAction('updateQuery');
+this.sendAction('updateQuery', query);
 
 
   }.observes('query'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js 
b/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
new file mode 100644
index 000..dc99fd1
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/saved-query.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/23642958/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index dcf27b4..4f60229 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -114,7 +114,6 @@ export default Ember.Route.extend({
 controller.set('isVisualExplainQuery', false);
 

[27/50] [abbrv] ambari git commit: AMBARI-19982 Admin View: issues with Users/Groups table filters. (ababiichuk)

[ncole]

AMBARI-19982 Admin View: issues with Users/Groups table filters. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6445ac8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6445ac8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6445ac8

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a6445ac838cc2b54e5ee5f943d4fa22a72fc7ad3
Parents: a7eafd5
Author: ababiichuk 
Authored: Mon Feb 13 13:56:29 2017 +0200
Committer: ababiichuk 
Committed: Mon Feb 13 14:45:50 2017 +0200

--
 .../controllers/clusters/UserAccessListCtrl.js  |  5 +-
 .../clusters/UserAccessListCtrl_test.js | 90 
 2 files changed, 1 insertion(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6445ac8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index 3737414..5dc6bd3 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -314,8 +314,6 @@ function($scope, $location, Cluster, $modal, $rootScope, 
$routeParams, Permissio
 
   $scope.clearFilters = function() {
 $scope.currentNameFilter = '';
-$scope.isUserActive = true;
-$scope.currentTypeFilter = $scope.typeFilterOptions[0];
 $scope.currentRoleFilter = $scope.roleFilterOptions[0];
 $scope.resetPagination();
   };
@@ -325,8 +323,7 @@ function($scope, $location, Cluster, $modal, $rootScope, 
$routeParams, Permissio
 
   $scope.$watch(
 function (scope) {
-  return Boolean(scope.currentNameFilter || (scope.currentTypeFilter && 
scope.currentTypeFilter.value)
-|| (scope.currentRoleFilter && scope.currentRoleFilter.value));
+  return Boolean(scope.currentNameFilter || (scope.currentRoleFilter && 
scope.currentRoleFilter.value));
 },
 function (newValue, oldValue, scope) {
   scope.isNotEmptyFilter = newValue;

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6445ac8/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
index 42fb453..14c0975 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
@@ -77,10 +77,6 @@ describe('#Cluster', function () {
 value: 'CLUSTER.USER'
   }
 ];
-scope.typeFilterOptions = [
-  {label: $t('common.user'), value: 'USER'},
-  {label: $t('common.group'), value: 'GROUP'}
-];
 scope.currentRoleFilter = scope.roleFilterOptions[1];
 scope.clearFilters();
 expect(scope.currentNameFilter).toEqual('');
@@ -98,16 +94,12 @@ describe('#Cluster', function () {
   var cases = [
 {
   currentNameFilter: '',
-  currentTypeFilter: null,
   currentRoleFilter: null,
   isNotEmptyFilter: false,
   title: 'no filters'
 },
 {
   currentNameFilter: '',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -116,9 +108,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: 'a',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -127,9 +116,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: '0',
-  currentTypeFilter: {
-value: ''
-  },
   currentRoleFilter: {
 value: ''
   },
@@ -138,20 +124,6 @@ describe('#Cluster', function () {
 },
 {
   currentNameFilter: '',
-  currentTypeFilter: {
-value: 'GROUP'
-  },
-  currentRoleFilter: {
-value: ''
-  },
-  isNotEmptyFilter: true,
-  title: 'type filter'
-},
-{
-

[37/50] [abbrv] ambari git commit: AMBARI-19830. HDP 3.0 TP - Support changed configs and scripts for HDFS (alejandro)

[ncole]

AMBARI-19830. HDP 3.0 TP - Support changed configs and scripts for HDFS 
(alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe27598a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe27598a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe27598a

Branch: refs/heads/branch-dev-patch-upgrade
Commit: fe27598ad828b51fa2740bed042224b7169e7b76
Parents: f27beb1
Author: Alejandro Fernandez 
Authored: Thu Jan 26 17:58:13 2017 -0800
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../HDFS/3.0.0.3.0/configuration/hdfs-site.xml  |   4 +
 .../3.0.0.3.0/package/scripts/params_linux.py   |   2 +-
 .../HDFS/3.0.0.3.0/package/scripts/utils.py |   8 +-
 .../stacks/2.5/HIVE/test_hive_server_int.py |   2 +-
 ambari-server/src/test/python/unitTests.py  | 106 +--
 5 files changed, 106 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fe27598a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hdfs-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hdfs-site.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hdfs-site.xml
index 689b6d08..60fde60 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hdfs-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hdfs-site.xml
@@ -35,13 +35,17 @@
 
 
   
+  
   
 dfs.webhdfs.enabled
 true

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe27598a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
index f7aa4c9..62a5edd 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
@@ -96,7 +96,7 @@ namenode_backup_dir = 
default("/configurations/hadoop-env/namenode_backup_dir",
 # hadoop default parameters
 mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*"
 hadoop_libexec_dir = stack_select.get_hadoop_dir("libexec")
-hadoop_bin = stack_select.get_hadoop_dir("sbin")
+hadoop_bin = stack_select.get_hadoop_dir("bin")
 hadoop_bin_dir = stack_select.get_hadoop_dir("bin")
 hadoop_home = stack_select.get_hadoop_dir("home")
 hadoop_secure_dn_user = hdfs_user

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe27598a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
index 48f5a1f..ab4308c 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
@@ -250,19 +250,19 @@ def service(action=None, name=None, user=None, 
options="", create_pid_dir=False,
 except ComponentIsNotRunning:
   pass
 
-  hadoop_daemon = format("{hadoop_bin}/hadoop-daemon.sh")
+  hdfs_bin = format("{hadoop_bin}/hdfs")
 
   if user == "root":
-cmd = [hadoop_daemon, "--config", params.hadoop_conf_dir, action, name]
+cmd = [hdfs_bin, "--config", params.hadoop_conf_dir, "--daemon", action, 
name]
 if options:
   cmd += [options, ]
 daemon_cmd = as_sudo(cmd)
   else:
-cmd = format("{ulimit_cmd} {hadoop_daemon} --config {hadoop_conf_dir} 
{action} {name}")
+cmd = format("{ulimit_cmd} {hdfs_bin} --config {hadoop_conf_dir} --daemon 
{action} {name}")
 if options:
   cmd += " " + options
 daemon_cmd = as_user(cmd, user)
- 
+
   if action == "start":
 # remove pid file from dead process
 File(pid_file, action="delete", not_if=process_id_exists_command)

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe27598a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py 
b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index 

[43/50] [abbrv] ambari git commit: AMBARI-19864 : Zookeeper namespace for Hive service should be taken from hive-interactive-site, when only Hive-server Interactive is installed (Vishal Suvagia via mu

[ncole]

AMBARI-19864 : Zookeeper namespace for Hive service should be taken from 
hive-interactive-site, when only Hive-server Interactive is installed (Vishal 
Suvagia via mugdha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4061cbab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4061cbab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4061cbab

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4061cbab874fb05eab46f0e85d3ba243bb1bf3ee
Parents: 9670245
Author: Vishal Suvagia 
Authored: Mon Feb 6 11:49:38 2017 +0530
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4061cbab/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 211fe0a..9191c12 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -705,7 +705,10 @@ if has_hive_interactive:
 hive_llap_principal = 
(config['configurations']['hive-interactive-site']['hive.llap.zk.sm.principal']).replace('_HOST',hostname.lower())
   pass
 
-hive_server2_zookeeper_namespace = 
config['configurations']['hive-site']['hive.server2.zookeeper.namespace']
+if len(hive_server_hosts) == 0 and len(hive_server_interactive_hosts) > 0:
+  hive_server2_zookeeper_namespace = 
config['configurations']['hive-interactive-site']['hive.server2.zookeeper.namespace']
+else:
+  hive_server2_zookeeper_namespace = 
config['configurations']['hive-site']['hive.server2.zookeeper.namespace']
 hive_zookeeper_quorum = 
config['configurations']['hive-site']['hive.zookeeper.quorum']
 
 if security_enabled:

[36/50] [abbrv] ambari git commit: AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. Additional fixes 2. (mpapirkovskyy)

[ncole]

AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. 
Additional fixes 2. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d7276e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d7276e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d7276e2

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2d7276e2d1338bc318273ab9ce13312966d1eb7f
Parents: 4b0c93e
Author: Myroslav Papirkovskyi 
Authored: Thu Feb 2 02:03:00 2017 +0200
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../server/controller/ControllerModule.java | 18 ++--
 .../apache/ambari/server/H2DatabaseCleaner.java | 91 ++--
 .../ambari/server/orm/dao/CrudDAOTest.java  |  5 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   | 16 ++--
 .../ComponentVersionCheckActionTest.java| 29 +--
 .../upgrades/UpgradeActionTest.java | 74 +++-
 .../ambari/server/state/ConfigHelperTest.java   | 14 ++-
 .../state/cluster/AlertDataManagerTest.java |  1 +
 pom.xml |  4 +
 9 files changed, 175 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d7276e2/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index b634a62..8646e51 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -214,14 +214,6 @@ public class ControllerModule extends AbstractModule {
 DatabaseType databaseType = configuration.getDatabaseType();
 LOG.info("Detected {} as the database type from the JDBC URL", 
databaseType);
 
-// custom jdbc driver properties
-Properties customDatabaseDriverProperties = 
configuration.getDatabaseCustomProperties();
-properties.putAll(customDatabaseDriverProperties);
-
-// custom persistence properties
-Properties customPersistenceProperties = 
configuration.getPersistenceCustomProperties();
-properties.putAll(customPersistenceProperties);
-
 switch (configuration.getPersistenceType()) {
   case IN_MEMORY:
 properties.setProperty(JDBC_URL, Configuration.JDBC_IN_MEMORY_URL);
@@ -229,7 +221,6 @@ public class ControllerModule extends AbstractModule {
 properties.setProperty(JDBC_USER, Configuration.JDBC_IN_MEMORY_USER);
 properties.setProperty(JDBC_PASSWORD, 
Configuration.JDBC_IN_MEMORY_PASSWORD);
 properties.setProperty(DDL_GENERATION, CREATE_ONLY);
-properties.setProperty(DDL_GENERATION_MODE, DDL_BOTH_GENERATION);
 properties.setProperty(THROW_EXCEPTIONS, "true");
 break;
   case REMOTE:
@@ -242,6 +233,15 @@ public class ControllerModule extends AbstractModule {
 break;
 }
 
+//allow to override values above
+// custom jdbc driver properties
+Properties customDatabaseDriverProperties = 
configuration.getDatabaseCustomProperties();
+properties.putAll(customDatabaseDriverProperties);
+
+// custom persistence properties
+Properties customPersistenceProperties = 
configuration.getPersistenceCustomProperties();
+properties.putAll(customPersistenceProperties);
+
 // determine the type of pool to use
 boolean isConnectionPoolingExternal = false;
 ConnectionPoolType connectionPoolType = 
configuration.getConnectionPoolType();

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d7276e2/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java 
b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
index 91477eb..493e88b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
@@ -26,6 +26,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -39,13 +40,69 @@ import javax.persistence.metamodel.EntityType;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.DBAccessorImpl;
 import 

[20/50] [abbrv] ambari git commit: AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)

[ncole]

AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eac0f57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eac0f57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eac0f57

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6eac0f57a61da4e76b175f0de43ab315a665b9c2
Parents: d510063
Author: Aravindan Vijayan 
Authored: Sun Feb 12 08:34:41 2017 -0800
Committer: Aravindan Vijayan 
Committed: Sun Feb 12 08:34:58 2017 -0800

--
 .../conf/hadoop-metrics2-hbase.properties.j2| 49 -
 .../src/main/conf/hadoop-metrics2.properties.j2 | 58 
 .../hadoop-metrics2-hbase.properties.j2 |  4 ++
 3 files changed, 4 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
deleted file mode 100644
index c819301..000
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2
+++ /dev/null
@@ -1,49 +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.
-
-# See http://wiki.apache.org/hadoop/GangliaMetrics
-#
-# Make sure you know whether you are using ganglia 3.0 or 3.1.
-# If 3.1, you will have to patch your hadoop instance with HADOOP-4675
-# And, yes, this file is named hadoop-metrics.properties rather than
-# hbase-metrics.properties because we're leveraging the hadoop metrics
-# package and hadoop-metrics.properties is an hardcoded-name, at least
-# for the moment.
-#
-# See also http://hadoop.apache.org/hbase/docs/current/metrics.html
-
-# HBase-specific configuration to reset long-running stats (e.g. compactions)
-# If this variable is left out, then the default is no expiration.
-hbase.extendedperiod = 3600
-
-# Configuration of the "hbase" context for timeline metrics service
-hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.period=10
-hbase.collector={{timeline_server_hosts}}:6188
-
-# Configuration of the "jvm" context for timeline metrics service
-jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-jvm.period=10
-jvm.collector={{timeline_server_hosts}}:6188
-
-# Configuration of the "rpc" context for timeline metrics service
-rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-rpc.period=10
-rpc.collector={{timeline_server_hosts}}:6188
-
-# Following hadoop example
-hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=10
-hbase.sink.timeline.collector=http://{{timeline_server_hosts}}:6188
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
deleted file mode 100644
index ec1377d..000
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2
+++ /dev/null
@@ -1,58 +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 

[49/50] [abbrv] ambari git commit: AMBARI-19745. Hive History Queries not working for Hive 2.0 in Hue-Migration View (Ishan Bhatt via gauravn7)

[ncole]

AMBARI-19745. Hive History Queries not working for Hive 2.0 in Hue-Migration 
View (Ishan Bhatt via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3436c4a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3436c4a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3436c4a1

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 3436c4a1addc11bd56ae6cb4711aec5cf54b06fe
Parents: 4061cba
Author: Gaurav Nagar 
Authored: Mon Feb 6 18:31:16 2017 +0530
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 .../historyquery/HiveHistoryQueryMigrationImplementation.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3436c4a1/contrib/views/hueambarimigration/src/main/java/org/apache/ambari/view/huetoambarimigration/migration/hive/historyquery/HiveHistoryQueryMigrationImplementation.java
--
diff --git 
a/contrib/views/hueambarimigration/src/main/java/org/apache/ambari/view/huetoambarimigration/migration/hive/historyquery/HiveHistoryQueryMigrationImplementation.java
 
b/contrib/views/hueambarimigration/src/main/java/org/apache/ambari/view/huetoambarimigration/migration/hive/historyquery/HiveHistoryQueryMigrationImplementation.java
index f154b39..33d57b4 100644
--- 
a/contrib/views/hueambarimigration/src/main/java/org/apache/ambari/view/huetoambarimigration/migration/hive/historyquery/HiveHistoryQueryMigrationImplementation.java
+++ 
b/contrib/views/hueambarimigration/src/main/java/org/apache/ambari/view/huetoambarimigration/migration/hive/historyquery/HiveHistoryQueryMigrationImplementation.java
@@ -138,12 +138,12 @@ public class HiveHistoryQueryMigrationImplementation {
 String epochtime1 = Long.toString(epochtime);
 PreparedStatement prSt = null;
 String revsql = null;
-if (versionName.contains("1.5")) {
-  prSt = ambaridatabase.insertToHiveHistoryForHiveNext(c, id, maxcount1, 
epochtime, dirname, username);
-}
 if (versionName.contains("1.0")) {
   prSt = ambaridatabase.insertToHiveHistoryForHive(c, id, maxcount1, 
epochtime, dirname, username);
+} else {
+  prSt = ambaridatabase.insertToHiveHistoryForHiveNext(c, id, maxcount1, 
epochtime, dirname, username);
 }
+
 logger.info("The actual insert statement is " + prSt);
 prSt.executeUpdate();
 revsql = ambaridatabase.revertSql(id, maxcount1);

[44/50] [abbrv] ambari git commit: AMBARI-19795 Ambari upgrade to not add ranger plugin configs under ranger plugin supported services (mugdha)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/94d9361e/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
index 3c0b29f..562684b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
@@ -23,19 +23,19 @@
 ranger.plugin.yarn.service.name
 {{repo_name}}
 Name of the Ranger service containing policies for this Yarn 
instance
-
+
   
   
 ranger.plugin.yarn.policy.source.impl
 org.apache.ranger.admin.client.RangerAdminRESTClient
 Class to retrieve policies from the source
-
+
   
   
 ranger.plugin.yarn.policy.rest.url
 {{policymgr_mgr_url}}
 URL to Ranger Admin
-
+
 
   
 admin-properties
@@ -47,18 +47,18 @@
 ranger.plugin.yarn.policy.rest.ssl.config.file
 /etc/hadoop/conf/ranger-policymgr-ssl-yarn.xml
 Path to the file containing SSL details to contact Ranger 
Admin
-
+
   
   
 ranger.plugin.yarn.policy.pollIntervalMs
 3
 How often to poll for changes in policies?
-
+
   
   
 ranger.plugin.yarn.policy.cache.dir
 /etc/ranger/{{repo_name}}/policycache
 Directory where Ranger policies are cached after successful 
retrieval from the source
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/94d9361e/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml
index efeea5f..0044680 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml
@@ -24,7 +24,7 @@
 xasecure.audit.is.enabled
 true
 Is Audit enabled?
-
+
   
 
   
@@ -41,7 +41,7 @@
 xasecure.audit.destination.hdfs
   
 
-
+
   
 
   
@@ -54,14 +54,14 @@
 xasecure.audit.destination.hdfs.dir
   
 
-
+
   
 
   
 xasecure.audit.destination.hdfs.batch.filespool.dir
 /var/log/atlas/audit/hdfs/spool
 /var/log/atlas/audit/hdfs/spool
-
+
   
 
   
@@ -78,7 +78,7 @@
 xasecure.audit.destination.solr
   
 
-
+
   
 
   
@@ -94,7 +94,7 @@
 ranger.audit.solr.urls
   
 
-
+
   
 
   
@@ -107,14 +107,14 @@
 ranger.audit.solr.zookeepers
   
 
-
+
   
 
   
 xasecure.audit.destination.solr.batch.filespool.dir
 /var/log/atlas/audit/solr/spool
 /var/log/atlas/audit/solr/spool
-
+
   
 
   
@@ -125,7 +125,7 @@
 
   boolean
 
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/94d9361e/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml
index 977127c..fd623cb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml
@@ -26,7 +26,7 @@
 Policy user for Atlas
 This user must be system user and also present at Ranger
   admin portal
-
+
   
 
   
@@ -36,7 +36,7 @@
 
   true
 
-
+
   
 
   
@@ -54,7 +54,7 @@
   boolean
   false
 
-
+
   
 
   
@@ -63,7 +63,7 @@
 Ranger repository config user
 Used for repository creation on ranger admin
 
-
+
   
 
   
@@ -76,55 +76,7 @@
 
   password
 
-
-  
-
-  
-external_admin_username
-
-External Ranger admin username
-Add ranger default admin username if want to communicate to 
external ranger
-
-  true
-
-
-  
-
-  
-external_admin_password
-
-External Ranger admin password
-PASSWORD
-Add ranger default admin password if want to communicate to 
external ranger
-
-  password
-  true
-
-   

[30/50] [abbrv] ambari git commit: AMBARI-19987 Oozie start failed after enabling credential store (dsen)

[ncole]

AMBARI-19987 Oozie start failed after enabling credential store (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d252665c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d252665c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d252665c

Branch: refs/heads/branch-dev-patch-upgrade
Commit: d252665ce94f532b08efb9bc5f31f7b8f6cde97a
Parents: fa32fec
Author: Dmytro Sen 
Authored: Mon Feb 13 19:42:59 2017 +0200
Committer: Dmytro Sen 
Committed: Mon Feb 13 19:42:59 2017 +0200

--
 .../ambari_agent/CustomServiceOrchestrator.py   | 12 +-
 .../ambari_commons/credential_store_helper.py   | 45 
 .../query/render/ClusterBlueprintRenderer.java  |  8 ++--
 .../internal/ServiceResourceProvider.java   |  1 -
 .../orm/entities/ServiceDesiredStateEntity.java | 21 -
 .../org/apache/ambari/server/state/Service.java |  8 
 .../apache/ambari/server/state/ServiceImpl.java | 40 +++--
 .../server/upgrade/UpgradeCatalog250.java   |  5 ---
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../0.12.0.2.0/package/scripts/params_linux.py  | 35 +++
 .../4.0.0.2.0/package/scripts/params_linux.py   | 20 -
 .../server/upgrade/UpgradeCatalog250Test.java   | 12 +-
 17 files changed, 90 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d252665c/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index bacda46..9f2852b 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -238,6 +238,7 @@ class CustomServiceOrchestrator():
 value_names.append(value_name) # Gather the value_name for 
deletion
   if len(credentials) > 0:
 configtype_credentials[config_type] = credentials
+logger.info("Identifying config {0} for CS: ".format(config_type))
   for value_name in value_names:
 # Remove the clear text password
 config.pop(value_name, None)
@@ -255,8 +256,11 @@ class CustomServiceOrchestrator():
 roleCommand = None
 if 'roleCommand' in commandJson:
   roleCommand = commandJson['roleCommand']
+task_id = None
+if 'taskId' in commandJson:
+  task_id = commandJson['taskId']
 
-logger.info('generateJceks: roleCommand={0}'.format(roleCommand))
+logger.info('Generating the JCEKS file: roleCommand={0} and taskId = 
{1}'.format(roleCommand, task_id))
 
 # Set up the variables for the external command to generate a JCEKS file
 java_home = commandJson['hostLevelParams']['java_home']
@@ -267,6 +271,12 @@ class CustomServiceOrchestrator():
 
 # Gather the password values and remove them from the configuration
 configtype_credentials = self.getConfigTypeCredentials(commandJson)
+
+# CS is enabled but no config property is available for this command
+if len(configtype_credentials) == 0:
+  logger.info("Credential store is enabled but no property are found that 
can be encrypted.")
+  commandJson['credentialStoreEnabled'] = "false"
+
 for config_type, credentials in configtype_credentials.items():
   config = commandJson['configurations'][config_type]
   file_path = os.path.join(self.getProviderDirectory(serviceName), 
"{0}.jceks".format(config_type))

http://git-wip-us.apache.org/repos/asf/ambari/blob/d252665c/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
--
diff --git 
a/ambari-common/src/main/python/ambari_commons/credential_store_helper.py 
b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
new file mode 100644
index 000..914c1c7
--- /dev/null
+++ b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+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 

[31/50] [abbrv] ambari git commit: AMBARI-19970 : AMS graphs are not present on cluster with SSL (Commit 2). (avijayan)

[ncole]

AMBARI-19970 : AMS graphs are not present on cluster with SSL (Commit 2). 
(avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cb9a6ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cb9a6ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cb9a6ad

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 7cb9a6ad53a926f055c5bf78ac2a9a8bd1668d78
Parents: d252665
Author: Aravindan Vijayan 
Authored: Mon Feb 13 10:56:46 2017 -0800
Committer: Aravindan Vijayan 
Committed: Mon Feb 13 10:56:46 2017 -0800

--
 .../0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7cb9a6ad/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 8c20f2b..8c6f86f 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -42,16 +42,19 @@ 
hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.period=30
 hbase.collector.hosts={{ams_collector_hosts}}
 hbase.port={{metric_collector_port}}
+hbase.protocol={{metric_collector_protocol}}
 
 jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 jvm.period=30
 jvm.collector.hosts={{ams_collector_hosts}}
 jvm.port={{metric_collector_port}}
+jvm.protocol={{metric_collector_protocol}}
 
 rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 rpc.period=30
 rpc.collector.hosts={{ams_collector_hosts}}
 rpc.port={{metric_collector_port}}
+rpc.protocol={{metric_collector_protocol}}
 
 
*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
@@ -60,6 +63,7 @@ hbase.sink.timeline.period={{metrics_collection_period}}
 hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}}
 hbase.sink.timeline.port={{metric_collector_port}}
+hbase.sink.timeline.protocol={{metric_collector_protocol}}
 hbase.sink.timeline.serviceName-prefix=ams
 
 # HTTPS properties

[47/50] [abbrv] ambari git commit: AMBARI-19846. ambari-agent.out getting filled with dummy traceback. (Attila Doroszlai via stoader)

[ncole]

AMBARI-19846. ambari-agent.out getting filled with dummy traceback. (Attila 
Doroszlai via stoader)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97f8ba81
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97f8ba81
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97f8ba81

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 97f8ba813bd5591694e28ec22e1372464423d519
Parents: 4ce8641
Author: Attila Doroszlai 
Authored: Mon Feb 6 15:54:55 2017 +0100
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 .../ambari_agent/CustomServiceOrchestrator.py | 12 
 .../ambari_agent/TestCustomServiceOrchestrator.py | 18 ++
 2 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/97f8ba81/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 9baaf08..e70c2d2 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -309,14 +309,10 @@ class CustomServiceOrchestrator():
 server_url_prefix = command['hostLevelParams']['jdk_location']
   else:
 server_url_prefix = command['commandParams']['jdk_location']
-
-  task_id = "status"
-  
-  try:
-task_id = command['taskId']
-command_name = command['roleCommand']
-  except KeyError:
-pass  # Status commands have no taskId
+
+  # Status commands have no taskId nor roleCommand
+  task_id = command['taskId'] if 'taskId' in command else 'status'
+  command_name = command['roleCommand'] if 'roleCommand' in command else 
None
 
   if forced_command_name is not None:  # If not supplied as an argument
 command_name = forced_command_name

http://git-wip-us.apache.org/repos/asf/ambari/blob/97f8ba81/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py 
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index 3985c5a..8e5e9a3 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -28,6 +28,7 @@ from unittest import TestCase
 import threading
 import tempfile
 import time
+import traceback
 from threading import Thread
 
 from mock.mock import MagicMock, patch
@@ -278,6 +279,23 @@ class TestCustomServiceOrchestrator(TestCase):
 self.assertTrue(run_file_mock.called)
 self.assertEqual(run_file_mock.call_count, 3)
 
+# running a status command
+run_file_mock.reset_mock()
+def return_traceback(*args, **kwargs):
+  return {
+'stderr': traceback.format_exc(),
+'stdout': '',
+'exitcode': 0,
+  }
+run_file_mock.side_effect = return_traceback
+
+status_command = dict(command)
+status_command['commandType'] = 'STATUS_COMMAND'
+del status_command['taskId']
+del status_command['roleCommand']
+ret = orchestrator.runCommand(status_command, "out.txt", "err.txt")
+self.assertEqual('None\n', ret['stderr'])
+
 run_file_mock.reset_mock()
 
 # Case when we force another command

[40/50] [abbrv] ambari git commit: AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. Fix imports for checkstyle. (mpapirkovskyy)

[ncole]

AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. Fix 
imports for checkstyle. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40f8ee94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40f8ee94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40f8ee94

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 40f8ee94056e83c1aa1e124bff4f38ba20ea0474
Parents: 2d7276e
Author: Myroslav Papirkovskyi 
Authored: Fri Feb 3 20:32:56 2017 +0200
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../server/upgrade/UpgradeCatalog250.java   | 31 +
 .../apache/ambari/server/H2DatabaseCleaner.java |  9 ---
 .../server/upgrade/UpgradeCatalog250Test.java   | 73 ++--
 3 files changed, 54 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40f8ee94/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 1e36a3c..18e9744 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -17,8 +17,20 @@
  */
 package org.apache.ambari.server.upgrade;
 
-import com.google.inject.Inject;
-import com.google.inject.Injector;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.CommandExecutionType;
 import org.apache.ambari.server.configuration.Configuration;
@@ -34,19 +46,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.support.JdbcUtils;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
 
 /**
  * Upgrade catalog for version 2.5.0.

http://git-wip-us.apache.org/repos/asf/ambari/blob/40f8ee94/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java 
b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
index 493e88b..190e54f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
@@ -18,19 +18,12 @@
 
 package org.apache.ambari.server;
 
-import static 
org.eclipse.persistence.config.PersistenceUnitProperties.DEFAULT_CREATE_JDBC_FILE_NAME;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import javax.persistence.EntityManager;
@@ -39,8 +32,6 @@ import javax.persistence.metamodel.EntityType;
 
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.DBAccessorImpl;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 
 import com.google.inject.Injector;
 import com.google.inject.persist.PersistService;

http://git-wip-us.apache.org/repos/asf/ambari/blob/40f8ee94/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index b950594..4dffea8 100644
--- 

[15/50] [abbrv] ambari git commit: AMBARI-19975. Hive2. Visual Explain -Show additional info when you click on a box, i.e. can drill down to get more info on operators. (pallavkul)

[ncole]

AMBARI-19975. Hive2. Visual Explain -Show additional info when you click on a 
box, i.e. can drill down to get more info on operators. (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d1253a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d1253a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d1253a6

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1d1253a6471113a78dd22faf453439ab13a19e48
Parents: 2364295
Author: pallavkul 
Authored: Sat Feb 11 17:06:43 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 17:06:43 2017 +0530

--
 .../ui/app/components/visual-explain-detail.js  | 31 +
 .../ui/app/components/visual-explain.js | 26 ++-
 .../resources/ui/app/routes/queries/query.js| 13 --
 .../src/main/resources/ui/app/styles/app.scss   | 49 
 .../components/visual-explain-detail.hbs| 29 
 .../app/templates/components/visual-explain.hbs |  5 ++
 6 files changed, 148 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
new file mode 100644
index 000..2c9ba00
--- /dev/null
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain-detail.js
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+  classNames:['visual-explain-detail-container'],
+
+  actions:{
+closeModal(){
+  this.sendAction('closeModal');
+}
+  }
+
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
index 6551974..6805bb8 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
@@ -20,8 +20,13 @@ import Ember from 'ember';
 import explain from '../utils/hive-explainer';
 
 export default Ember.Component.extend({
+
   visualExplainJson:'',
 
+  showDetailsModal: false,
+
+  explainDetailData: '',
+
   visualExplainInput: Ember.computed('visualExplainJson', function () {
 return this.get('visualExplainJson');
   }),
@@ -39,6 +44,7 @@ export default Ember.Component.extend({
   .attr('height', height);
 
 const container = svg.append('g');
+
 const zoom =
   d3.zoom()
 .scaleExtent([1 / 10, 4])
@@ -49,16 +55,34 @@ export default Ember.Component.extend({
   svg
 .call(zoom);
 
-const onRequestDetail = data => this.sendAction('showStepDetail', data);
+const onRequestDetail = data => this.set('explainDetailData', 
JSON.stringify( data, null, '  ') );
 
 explain(JSON.parse(this.get('visualExplainInput')), svg, container, zoom, 
onRequestDetail);
 
   },
 
+  click(event){
+
+if(this.get('explainDetailData') === ''){
+  return;
+}
+
+Ember.run.later(() => {
+  this.set('showDetailsModal', true);
+}, 100);
+  },
+
   actions:{
 expandQueryResultPanel(){
   this.sendAction('expandQueryResultPanel');
+},
+
+closeModal(){
+  this.set('showDetailsModal', false);
+  this.set('explainDetailData', '');
+  false;
 }
+
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d1253a6/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js

[10/50] [abbrv] ambari git commit: AMBARI-19971. HiveServerInteractive. (1). Use the correct value for Node(s) used for running LLAP Daemon(s). (2). Set 'num_llap_nodes' calculated value only for non

[ncole]

AMBARI-19971. HiveServerInteractive. (1). Use the correct value for Node(s) 
used for running LLAP Daemon(s). (2). Set 'num_llap_nodes' calculated value 
only for non Ambari managed queue.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4c83843
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4c83843
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4c83843

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f4c83843674764918bd50443705af1fce9852a2b
Parents: 38a17a7
Author: Swapan Shridhar 
Authored: Fri Feb 10 13:29:41 2017 -0800
Committer: Swapan Shridhar 
Committed: Fri Feb 10 15:13:48 2017 -0800

--
 .../package/scripts/hive_server_interactive.py  | 12 ++---
 .../0.12.0.2.0/package/scripts/params_linux.py  |  2 +
 .../HIVE/configuration/hive-interactive-env.xml |  4 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|  9 +++-
 .../HIVE/configuration/hive-interactive-env.xml | 31 -
 .../stacks/2.5/common/test_stack_advisor.py | 49 ++--
 6 files changed, 83 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c83843/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index 1f1d9a8..2ab48ae 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -281,10 +281,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 
   unique_name = "llap-slider%s" % 
datetime.utcnow().strftime('%Y-%m-%d_%H-%M-%S')
 
-  cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --instances {params.num_llap_nodes}"
-   " --slider-am-container-mb {params.slider_am_container_mb} 
--size {params.llap_daemon_container_size}m"
-   " --cache {params.hive_llap_io_mem_size}m --xmx 
{params.llap_heap_size}m --loglevel {params.llap_log_level}"
-   " {params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
+  cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --slider-am-container-mb {params.slider_am_container_mb} "
+   "--size {params.llap_daemon_container_size}m --cache 
{params.hive_llap_io_mem_size}m --xmx {params.llap_heap_size}m "
+   "--loglevel {params.llap_log_level} 
{params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
 
   # Append params that are supported from Hive llap GA version.
   if params.stack_supports_hive_interactive_ga:
@@ -300,11 +299,12 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 else:
   Logger.info("Setting slider_placement: 4, as 
llap_daemon_container_size : {0} <= 0.5 * "
  "YARN NodeManager 
Memory({1})".format(params.llap_daemon_container_size, params.yarn_nm_mem))
-cmd += format(" --slider-placement {slider_placement} 
--skiphadoopversion --skiphbasecp")
+cmd += format(" --slider-placement {slider_placement} 
--skiphadoopversion --skiphbasecp --instances 
{params.num_llap_daemon_running_nodes}")
 
 # Setup the logger for the ga version only
 cmd += format(" --logger {params.llap_logger}")
-
+  else:
+cmd += format(" --instances {params.num_llap_nodes}")
   if params.security_enabled:
 llap_keytab_splits = params.hive_llap_keytab_file.split("/")
 Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits))

http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c83843/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index a5618ca..936b194 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -685,6 +685,8 @@ if has_hive_interactive:
   num_retries_for_checking_llap_status = 

[16/50] [abbrv] ambari git commit: AMBARI-19931. HiveView2.0: DB panel shows up on Query result full screen (pallavkul)

[ncole]

AMBARI-19931. HiveView2.0: DB panel shows up on Query result full screen 
(pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77b5b16e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77b5b16e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77b5b16e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 77b5b16e2bd68ed18e193104b56ad0bb434ee505
Parents: 1d1253a
Author: pallavkul 
Authored: Sat Feb 11 17:17:12 2017 +0530
Committer: pallavkul 
Committed: Sat Feb 11 17:17:12 2017 +0530

--
 .../resources/ui/app/routes/queries/query.js| 43 +---
 .../src/main/resources/ui/app/services/query.js |  2 -
 .../src/main/resources/ui/app/styles/app.scss   |  1 -
 .../ui/app/templates/queries/query.hbs  |  4 +-
 4 files changed, 40 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 72682f5..88202ff 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -24,6 +24,9 @@ export default Ember.Route.extend({
   jobs: Ember.inject.service(),
   savedQueries: Ember.inject.service(),
 
+  isQueryEdidorPaneExpanded: false,
+  isQueryResultPanelExpanded: false,
+
   beforeModel(){
 let existingWorksheets = this.store.peekAll('worksheet');
 existingWorksheets.setEach('selected', false);
@@ -161,7 +164,6 @@ export default Ember.Route.extend({
   this.get('controller.model').set('selectedDb', db);
 },
 
-
 visualExplainQuery(){
   this.get('controller').set('isVisualExplainQuery', true );
   this.send('executeQuery');
@@ -389,15 +391,46 @@ export default Ember.Route.extend({
 },
 
 expandQueryEdidorPanel(){
+
+  if(!this.get('isQueryEdidorPaneExpanded')){
+this.set('isQueryEdidorPaneExpanded', true);
+  } else {
+this.set('isQueryEdidorPaneExpanded', false);
+  }
   Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
   Ember.$('.database-panel').toggleClass("hide");
+
 },
 
 expandQueryResultPanel(){
-  Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
-  Ember.$('.query-editor-container').toggleClass("hide");
-  Ember.$('.database-panel').toggleClass("hide");
-  this.send('adjustPanelSize');
+
+  if(!this.get('isQueryResultPanelExpanded')){
+
+if(!this.get('isQueryEdidorPaneExpanded')){
+  Ember.$('.query-editor-container').addClass("hide");
+  Ember.$('.database-panel').addClass("hide");
+  Ember.$('.query-editor-panel').addClass('query-editor-full-width');
+} else {
+
+  Ember.$('.query-editor-container').addClass("hide");
+}
+this.set('isQueryResultPanelExpanded', true);
+
+  } else {
+
+if(!this.get('isQueryEdidorPaneExpanded')){
+  Ember.$('.query-editor-container').removeClass("hide");
+  Ember.$('.database-panel').removeClass("hide");
+  
Ember.$('.query-editor-panel').removeClass('query-editor-full-width');
+} else {
+
+  Ember.$('.query-editor-container').removeClass("hide");
+
+}
+this.set('isQueryResultPanelExpanded', false);
+
+  }
+
 },
 
 adjustPanelSize(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/services/query.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/services/query.js
index b484c74..42d4fb0 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/services/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/services/query.js
@@ -80,6 +80,4 @@ export default Ember.Service.extend({
 });
   }
 
-
-
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/77b5b16e/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index 6469b2e..a9c91c7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -322,7 +322,6 @@ pre {
 }
 
 

[25/50] [abbrv] ambari git commit: AMBARI-19944 Increase SNMP Unit Test Coverage (dsen)

[ncole]

AMBARI-19944 Increase SNMP Unit Test Coverage (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b8176ff6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b8176ff6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b8176ff6

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b8176ff63c00115156062a2af9d2e2cae164e514
Parents: a906061
Author: Dmytro Sen 
Authored: Mon Feb 13 12:42:06 2017 +0200
Committer: Dmytro Sen 
Committed: Mon Feb 13 12:42:06 2017 +0200

--
 .../AlertNoticeDispatchServiceTest.java | 159 ++-
 1 file changed, 152 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b8176ff6/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
index 07094a8..8423eaf 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/services/AlertNoticeDispatchServiceTest.java
@@ -24,13 +24,16 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.EnumSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.Vector;
 import java.util.concurrent.Executor;
 
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -38,6 +41,7 @@ import org.apache.ambari.server.notifications.DispatchFactory;
 import org.apache.ambari.server.notifications.Notification;
 import org.apache.ambari.server.notifications.NotificationDispatcher;
 import org.apache.ambari.server.notifications.TargetConfigurationResult;
+import org.apache.ambari.server.notifications.dispatchers.AmbariSNMPDispatcher;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
 import org.apache.ambari.server.orm.dao.AlertDispatchDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
@@ -48,10 +52,24 @@ import org.apache.ambari.server.state.AlertState;
 import org.apache.ambari.server.state.NotificationState;
 import org.apache.ambari.server.state.alert.Scope;
 import org.apache.ambari.server.state.alert.SourceType;
+import org.apache.ambari.server.state.alert.TargetType;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.snmp4j.CommandResponder;
+import org.snmp4j.CommandResponderEvent;
+import org.snmp4j.PDU;
+import org.snmp4j.Snmp;
+import org.snmp4j.TransportMapping;
+import org.snmp4j.mp.SnmpConstants;
+import org.snmp4j.smi.Address;
+import org.snmp4j.smi.GenericAddress;
+import org.snmp4j.smi.Integer32;
+import org.snmp4j.smi.OID;
+import org.snmp4j.smi.OctetString;
+import org.snmp4j.smi.VariableBinding;
+import org.snmp4j.transport.DefaultUdpTransportMapping;
 
 import com.google.inject.Binder;
 import com.google.inject.Guice;
@@ -240,10 +258,10 @@ public class AlertNoticeDispatchServiceTest extends 
AlertNoticeDispatchService {
* @throws Exception
*/
   @Test
-  public void testSingleDispatch() throws Exception {
+  public void testSingleSnmpDispatch() throws Exception {
 MockSnmpDispatcher dispatcher = new MockSnmpDispatcher();
 
-List notices = getSnmpMockNotices();
+List notices = getSnmpMockNotices("SNMP");
 AlertNoticeEntity notice1 = notices.get(0);
 AlertNoticeEntity notice2 = notices.get(1);
 
@@ -269,6 +287,105 @@ public class AlertNoticeDispatchServiceTest extends 
AlertNoticeDispatchService {
   }
 
   /**
+   * Tests a digest dispatch for Ambari SNMP.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testAmbariSnmpSingleDispatch() throws Exception {
+MockAmbariSnmpDispatcher dispatcher = new MockAmbariSnmpDispatcher();
+
+List notices = getSnmpMockNotices("AMBARI_SNMP");
+AlertNoticeEntity notice1 = notices.get(0);
+AlertNoticeEntity notice2 = notices.get(1);
+
+EasyMock.expect(m_dao.findPendingNotices()).andReturn(notices).once();
+EasyMock.expect(m_dao.merge(notice1)).andReturn(notice1).once();
+EasyMock.expect(m_dao.merge(notice2)).andReturn(notice2).once();
+
EasyMock.expect(m_dispatchFactory.getDispatcher("AMBARI_SNMP")).andReturn(dispatcher).atLeastOnce();
+
+EasyMock.replay(m_dao, m_dispatchFactory);
+
+

[23/50] [abbrv] ambari git commit: AMBARI-19968. Control Log Level for all Hive components for log4j - UT fix (Madhuvanthi Radhakrishnan via smohanty)

[ncole]

AMBARI-19968. Control Log Level for all Hive components for log4j - UT fix 
(Madhuvanthi Radhakrishnan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b695bf2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b695bf2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b695bf2b

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b695bf2bfcb96b48e7896a6242d25cf786cb46df
Parents: 3a95192
Author: Sumit Mohanty 
Authored: Sun Feb 12 19:10:12 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Feb 12 19:10:12 2017 -0800

--
 .../org/apache/ambari/server/state/theme/TabLayout.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b695bf2b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
index 4f6cf8f..98222de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java
@@ -19,16 +19,15 @@
 package org.apache.ambari.server.state.theme;
 
 
-
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+
 
 @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)

[34/50] [abbrv] ambari git commit: AMBARI-19594. configure kerberos authentication for Druid UIs (Nishant Bangarwa via smohanty)

[ncole]

AMBARI-19594. configure kerberos authentication for Druid UIs (Nishant Bangarwa 
via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f39bdf8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f39bdf8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f39bdf8

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4f39bdf8cc5aa58d05647725078aaa0223b7021d
Parents: ed92827
Author: Sumit Mohanty 
Authored: Fri Feb 3 13:24:24 2017 -0800
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../DRUID/0.9.2/configuration/druid-common.xml   |  6 ++
 .../DRUID/0.9.2/package/scripts/druid.py |  2 ++
 .../DRUID/0.9.2/package/scripts/params.py|  5 -
 .../stacks/HDP/2.6/services/DRUID/kerberos.json  | 19 ++-
 .../test/python/stacks/2.6/DRUID/test_druid.py   |  2 ++
 .../test/python/stacks/2.6/configs/default.json  |  3 ++-
 6 files changed, 34 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4f39bdf8/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
index e00480e..a494750 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
@@ -46,6 +46,12 @@
 
   
   
+druid.security.extensions.loadList
+[]
+A comma-separated list of one or more druid security 
extensions to load. This property will be set via the kerberos wizard and User 
will not be allowed to modify this when security is enabled.
+
+  
+  
 druid.zk.service.host
 localhost:2181
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4f39bdf8/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index 20eda92..18febeb 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -48,6 +48,8 @@ def druid(upgrade_type=None, nodeType=None):
 'druid.service']
   druid_common_config['druid.selectors.coordinator.serviceName'] = \
 params.config['configurations']['druid-coordinator']['druid.service']
+  druid_common_config['druid.extensions.loadList'] = 
json.dumps(eval(params.druid_extensions_load_list) +
+ 
eval(params.druid_security_extensions_load_list))
 
   # delete the password and user if empty otherwiswe derby will fail.
   if 'derby' == druid_common_config['druid.metadata.storage.type']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/4f39bdf8/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index 558087d..aed4043 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -74,6 +74,9 @@ druid_log_dir = 
config['configurations']['druid-env']['druid_log_dir']
 druid_classpath = config['configurations']['druid-env']['druid_classpath']
 druid_extensions = 
config['configurations']['druid-common']['druid.extensions.pullList']
 druid_repo_list = 
config['configurations']['druid-common']['druid.extensions.repositoryList']
+druid_extensions_load_list = 
config['configurations']['druid-common']['druid.extensions.loadList']
+druid_security_extensions_load_list = 
config['configurations']['druid-common']['druid.security.extensions.loadList']
+
 
 # status params
 druid_pid_dir = status_params.druid_pid_dir
@@ -121,7 +124,7 @@ hdfs_site = config['configurations']['hdfs-site']
 default_fs = config['configurations']['core-site']['fs.defaultFS']
 dfs_type = default("/commandParams/dfs_type", "")
 
-# Kerberose
+# Kerberos
 druid_principal_name = 

[07/50] [abbrv] ambari git commit: AMBARI-19962 Clicking on the login button (or hitting page refresh) to seeing the dashboard takes a while on a 1000-node cluster. (atkach)

[ncole]

AMBARI-19962 Clicking on the login button (or hitting page refresh) to seeing 
the dashboard takes a while on a 1000-node cluster. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8a99618
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8a99618
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8a99618

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e8a9961841e0eaac2b471526068afabf37d10a35
Parents: fe1704e
Author: Andrii Tkach 
Authored: Fri Feb 10 17:59:58 2017 +0200
Committer: Andrii Tkach 
Committed: Fri Feb 10 21:37:29 2017 +0200

--
 ambari-web/app/router.js  | 37 ++
 ambari-web/app/utils/ajax/ajax.js |  2 +-
 2 files changed, 30 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8a99618/ambari-web/app/router.js
--
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index d671e86..df54303 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -256,16 +256,35 @@ App.Router = Em.Router.extend({
 
   displayLoginName: Em.computed.truncate('loginName', 10, 10),
 
+  /**
+   * @type {$.ajax|null}
+   */
+  clusterDataRequest: null,
+
+  /**
+   * If request was already sent on login then use saved clusterDataRequest 
and don't make second call
+   * @returns {$.ajax}
+   */
+  getClusterDataRequest: function() {
+var clusterDataRequest = this.get('clusterDataRequest');
+if (clusterDataRequest) {
+  this.set('clusterDataRequest', null);
+  return clusterDataRequest;
+} else {
+  return App.ajax.send({
+name: 'router.login.clusters',
+sender: this,
+success: 'onAuthenticationSuccess',
+error: 'onAuthenticationError'
+  });
+}
+  },
+
   getAuthenticated: function () {
 var dfd = $.Deferred();
 var self = this;
 var auth = App.db.getAuthenticated();
-App.ajax.send({
-  name: 'router.login.clusters',
-  sender: this,
-  success: 'onAuthenticationSuccess',
-  error: 'onAuthenticationError'
-}).complete(function (xhr) {
+this.getClusterDataRequest().complete(function (xhr) {
   if (xhr.state() === 'resolved') {
 // if server knows the user and user authenticated by UI
 if (auth) {
@@ -535,12 +554,12 @@ App.Router = Em.Router.extend({
   this.loginGetClustersSuccessCallback(self.get('clusterData'), {}, 
requestData);
 }
 else {
-  App.ajax.send({
+  this.set('clusterDataRequest', App.ajax.send({
 name: 'router.login.clusters',
 sender: self,
 data: requestData,
 success: 'loginGetClustersSuccessCallback'
-  });
+  }));
 }
   },
 
@@ -584,6 +603,8 @@ App.Router = Em.Router.extend({
 router.transitionToAdminView();
   }
 }
+// set cluster name and security type
+App.router.get('clusterController').reloadSuccessCallback(clustersData);
 App.set('isPermissionDataLoaded', true);
 App.router.get('loginController').postLogin(true, true);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8a99618/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index e344128..ae3947f 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2290,7 +2290,7 @@ var urls = {
 mock: '/data/users/privileges_{userName}.json'
   },
   'router.login.clusters': {
-'real': '/clusters?fields=Clusters/provisioning_state',
+'real': 
'/clusters?fields=Clusters/provisioning_state,Clusters/security_type',
 'mock': '/data/clusters/info.json'
   },
   'router.login.message': {

[38/50] [abbrv] ambari git commit: AMBARI-19844. Hive View 2.0: Allow user to rename table.(dipayanb)

[ncole]

AMBARI-19844. Hive View 2.0: Allow user to rename table.(dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/309d9fd4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/309d9fd4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/309d9fd4

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 309d9fd4cf14a4d06a9bbd94925d6e4626963500
Parents: 60c3539
Author: Dipayan Bhowmick 
Authored: Mon Feb 6 11:43:04 2017 +0530
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../hive20/resources/browser/DDLService.java| 20 +++--
 .../resources/ui/app/adapters/application.js| 33 
 .../src/main/resources/ui/app/adapters/table.js |  9 +++
 .../ui/app/components/table-rename-form.js  | 63 +++
 .../resources/ui/app/controllers/application.js |  5 +-
 .../hive20/src/main/resources/ui/app/router.js  |  1 +
 .../main/resources/ui/app/routes/application.js |  3 +-
 .../databases/database/tables/table/rename.js   | 83 
 .../ui/app/services/table-operations.js | 11 +++
 .../templates/components/table-rename-form.hbs  | 31 
 .../databases/database/tables/table.hbs |  1 +
 .../databases/database/tables/table/rename.hbs  | 46 +++
 .../src/main/resources/ui/config/environment.js |  6 ++
 13 files changed, 290 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/309d9fd4/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLService.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLService.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLService.java
index af8e1cd..89b9d84 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLService.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLService.java
@@ -158,18 +158,17 @@ public class DDLService extends BaseService {
   @PUT
   @Path("databases/{database_id}/tables/{table_id}/rename")
   @Produces(MediaType.APPLICATION_JSON)
-  @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+  @Consumes(MediaType.APPLICATION_JSON)
   public Response renameTable(@PathParam("database_id") String 
oldDatabaseName, @PathParam("table_id") String oldTableName,
-  @FormParam("new_database_id") String 
newDatabaseName, @FormParam("new_table_id")
-  String newTableName) {
+  TableRenameRequest request) {
 try {
-  Job job = proxy.renameTable(oldDatabaseName, oldTableName, 
newDatabaseName, newTableName, getResourceManager());
+  Job job = proxy.renameTable(oldDatabaseName, oldTableName, 
request.newDatabase, request.newTable, getResourceManager());
   JSONObject response = new JSONObject();
   response.put("job", job);
   return 
Response.status(Response.Status.ACCEPTED).entity(response).build();
 } catch (ServiceException e) {
   LOG.error("Exception occurred while renaming table for oldDatabaseName 
{}, oldTableName: {}, newDatabaseName : {}," +
-" newTableName : {}", oldDatabaseName, oldTableName, newDatabaseName, 
newTableName, e);
+" newTableName : {}", oldDatabaseName, oldTableName, 
request.newDatabase, request.newTable, e);
   throw new ServiceFormattedException(e);
 }
   }
@@ -346,4 +345,15 @@ public class DDLService extends BaseService {
   public static class CreateDatabaseRequest {
 public String name;
   }
+
+  /**
+   * Wrapper class for table rename request
+   */
+  public static class TableRenameRequest {
+/* New database name */
+public String newDatabase;
+
+/* New table name */
+public String newTable;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/309d9fd4/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js 
b/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
index 1cdab9e..9cc8658 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
@@ -21,14 +21,14 @@ import DS from 'ember-data';
 import ENV from 'ui/config/environment';
 
 export default DS.RESTAdapter.extend({
-  init: function() {
+  init: function () {
 Ember.$.ajaxSetup({
   cache: false
 });
   },
 
-  namespace: Ember.computed(function() {
-var 

[26/50] [abbrv] ambari git commit: AMBARI-19058. Perf: Deploy 3000 Agent cluster and find perf bugs. Part5.(vbrodetskyi)

[ncole]

AMBARI-19058. Perf: Deploy 3000 Agent cluster and find perf bugs. 
Part5.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7eafd59
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7eafd59
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7eafd59

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a7eafd59db2f9771b9e2b08d6a71406e05309b5c
Parents: b8176ff
Author: Vitaly Brodetskyi 
Authored: Mon Feb 13 14:10:21 2017 +0200
Committer: Vitaly Brodetskyi 
Committed: Mon Feb 13 14:10:21 2017 +0200

--
 .../resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml   | 2 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7eafd59/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
index 4dbd2bb..059deff 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml
@@ -41,7 +41,7 @@
   
 
 
-  FAKEZOOKEEPER/FAKEZOOKEEPER_SERVER
+  ZOOKEEPER/ZOOKEEPER_SERVER
   cluster
   
 true

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7eafd59/contrib/utils/perf/deploy-gce-perf-cluster.py
--
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py 
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index 6364122..7431ae9 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -338,7 +338,10 @@ def create_server_script(server_host_name):
   "sed -i -f 
/home/ambari/ambari-server/src/main/resources/stacks/PERF/install_packages.sed 
/var/lib/ambari-agent/cache/custom_actions/scripts/install_packages.py\n" + \
   "\n" + \
   "\n" + \
-  "yum install mysql-connector-java* -y\n" + \
+  "cd /; wget 
http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40.jar;\n;
 + \
+  "mkdir /usr/share/java; chmod 777 /usr/share/java;" + \
+  "cp mysql-connector-java-5.1.40.jar /usr/share/java/; chmod 777 
/usr/share/java/mysql-connector-java-5.1.40.jar;\n" + \
+  "ln -s /usr/share/java/mysql-connector-java-5.1.40.jar 
/usr/share/java/mysql-connector-java.jar;\n" + \
   "cd /etc/yum.repos.d/; wget 
http://repo.mysql.com/mysql-community-release-el6-5.noarch.rpm; rpm -ivh 
mysql-community-release-el6-5.noarch.rpm;" + \
   "yum clean all; yum install mysql-server -y\n" + \
   "sed -i -e 
's/mysqld]/mysqld]\\nmax_allowed_packet=1024M\\njoin_buffer_size=512M\\nsort_buffer_size=128M\\nread_rnd_buffer_size=128M\\ninnodb_buffer_pool_size=16G"
 \

[41/50] [abbrv] ambari git commit: AMBARI-19848. Hive View 2.0: Allow user to create database. (dipayanb)

[ncole]

AMBARI-19848. Hive View 2.0: Allow user to create database. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60c35398
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60c35398
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60c35398

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 60c353981af950d9713d9d5707c8ba8b0b08324c
Parents: fe27598
Author: Dipayan Bhowmick 
Authored: Mon Feb 6 11:24:12 2017 +0530
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../CreateDatabaseQueryGenerator.java   | 44 +
 .../DeleteDatabaseQueryGenerator.java   |  2 +-
 .../view/hive20/resources/browser/DDLProxy.java | 12 
 .../hive20/resources/browser/DDLService.java| 31 +
 .../main/resources/ui/app/adapters/database.js  |  8 +++
 .../ui/app/components/create-database-form.js   | 59 +
 .../hive20/src/main/resources/ui/app/router.js  |  1 +
 .../main/resources/ui/app/routes/databases.js   |  4 --
 .../databases/database/tables/new-database.js   | 68 
 .../ui/app/services/table-operations.js | 11 
 .../components/create-database-form.hbs | 31 +
 .../resources/ui/app/templates/databases.hbs|  2 +-
 .../databases/database/tables/new-database.hbs  | 47 ++
 13 files changed, 314 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/60c35398/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateDatabaseQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateDatabaseQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateDatabaseQueryGenerator.java
new file mode 100644
index 000..c72df03
--- /dev/null
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateDatabaseQueryGenerator.java
@@ -0,0 +1,44 @@
+/**
+* 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.
+*/
+
+package org.apache.ambari.view.hive20.internal.query.generators;
+
+import org.apache.ambari.view.hive20.exceptions.ServiceException;
+import org.apache.commons.lang3.StringUtils;
+import com.google.common.base.Optional;
+
+public class CreateDatabaseQueryGenerator implements QueryGenerator {
+  public final String databaseName;
+
+  public CreateDatabaseQueryGenerator(String databaseName) {
+this.databaseName = databaseName;
+  }
+
+  public String getDatabaseName() {
+return databaseName;
+  }
+
+  @Override
+  public Optional getQuery() throws ServiceException {
+if(StringUtils.isEmpty(this.getDatabaseName())){
+  throw new ServiceException("Database name cannot be null or empty.");
+}
+
+return Optional.of("CREATE DATABASE `" + this.getDatabaseName() + "`");
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/60c35398/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/DeleteDatabaseQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/DeleteDatabaseQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/DeleteDatabaseQueryGenerator.java
index 6e1e1a5..189cd5e 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/DeleteDatabaseQueryGenerator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/DeleteDatabaseQueryGenerator.java
@@ -1,4 +1,4 @@
-/*
+/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for 

[42/50] [abbrv] ambari git commit: AMBARI-19876. Popup with alerts on the Service summary doesn't have arrows for alerts with state "None" (onechiporenko)

[ncole]

AMBARI-19876. Popup with alerts on the Service summary doesn't have arrows for 
alerts with state "None" (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9670245d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9670245d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9670245d

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9670245d38031e707fcb633a31f0998770cd8724
Parents: 94d9361
Author: Oleg Nechiporenko 
Authored: Mon Feb 6 11:32:12 2017 +0200
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 ambari-web/app/controllers/main/service/info/summary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9670245d/ambari-web/app/controllers/main/service/info/summary.js
--
diff --git a/ambari-web/app/controllers/main/service/info/summary.js 
b/ambari-web/app/controllers/main/service/info/summary.js
index 9bdf83a..0ca9775 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -394,9 +394,9 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
   };
 
   serviceDefinitions.forEach(function (definition) {
+definition.set('isCollapsed', true);
 Object.keys(definitionTypes).forEach(function (type) {
   if (definition.get(type)) {
-definition.set('isCollapsed', true);
 definitionTypes[type].push(definition);
 serviceDefinitions = serviceDefinitions.without(definition);
   }

[35/50] [abbrv] ambari git commit: AMBARI-19859. The user must be clearly communicated about YARN pre-emption requirements when Hive LLAP is enabled. (Vivek Subramanian via yusaku)

[ncole]

AMBARI-19859. The user must be clearly communicated about YARN pre-emption 
requirements when Hive LLAP is enabled. (Vivek Subramanian via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f27beb11
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f27beb11
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f27beb11

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f27beb111995f473ba4ed43c235d6300a2fc2f94
Parents: 4f39bdf
Author: Yusaku Sako 
Authored: Fri Feb 3 15:17:35 2017 -0800
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml | 4 ++--
 .../HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f27beb11/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 89eccc6..e636e0c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -23,8 +23,8 @@
   
 enable_hive_interactive
 false
-Enable or disable interactive query in this 
cluster.
-Enable Interactive Query (Tech Preview)
+Enable or disable interactive query in this cluster. 
br Note: Hive LLAP may not start up on busy clusters if YARN 
pre-emption is not enabled. Enable via the YARN configs page.
+Enable Interactive Query (Tech Preview, requires YARN 
pre-emption)
 
   value-list
   false

http://git-wip-us.apache.org/repos/asf/ambari/blob/f27beb11/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
index 787dcb1..af656f4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
@@ -23,8 +23,8 @@
   
 enable_hive_interactive
 false
-Enable or disable interactive query in this 
cluster.
-Enable Interactive Query
+Enable or disable interactive query in this cluster. 
br Note: Hive LLAP may not start up on busy clusters if YARN 
pre-emption is not enabled. Enable via the YARN configs page.
+Enable Interactive Query (requires YARN 
pre-emption)
 
   value-list
   false

[48/50] [abbrv] ambari git commit: AMBARI-19877. Confirmation for deleting services show serviceName and not displayName (onechiporenko)

[ncole]

AMBARI-19877. Confirmation for deleting services show serviceName and not 
displayName (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1756ce5e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1756ce5e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1756ce5e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1756ce5ea6afb7256c5fb7e987a1cdb91d073d71
Parents: 3436c4a
Author: Oleg Nechiporenko 
Authored: Mon Feb 6 13:57:39 2017 +0200
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 ambari-web/app/controllers/main/service/item.js | 15 --
 .../test/controllers/main/service/item_test.js  | 54 ++--
 2 files changed, 62 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1756ce5e/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 9758ac3..7010ab5 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1531,10 +1531,17 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   },
 
   confirmServiceDeletion: function() {
-var progressPopup = this.get('deleteServiceProgressPopup'),
-  msg = this.get('interDependentServices.length')
-? 
Em.I18n.t('services.service.delete.service.success.confirmation.plural').format(this.get('serviceNamesToDelete').join(','))
-: 
Em.I18n.t('services.service.delete.service.success.confirmation').format(this.get('content.serviceName'));
+let serviceNames, msg;
+if (this.get('interDependentServices.length')) {
+  serviceNames = this.get('serviceNamesToDelete').map(serviceName => 
App.format.role(serviceName, true)).join(', ');
+  msg = 
Em.I18n.t('services.service.delete.service.success.confirmation.plural').format(serviceNames);
+}
+else {
+  serviceNames = App.format.role(this.get('content.serviceName'), true);
+  msg = 
Em.I18n.t('services.service.delete.service.success.confirmation').format(serviceNames);
+}
+
+var progressPopup = this.get('deleteServiceProgressPopup');
 if (progressPopup) {
   progressPopup.onClose();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1756ce5e/ambari-web/test/controllers/main/service/item_test.js
--
diff --git a/ambari-web/test/controllers/main/service/item_test.js 
b/ambari-web/test/controllers/main/service/item_test.js
index b582e86..302a9a5 100644
--- a/ambari-web/test/controllers/main/service/item_test.js
+++ b/ambari-web/test/controllers/main/service/item_test.js
@@ -28,7 +28,7 @@ require('controllers/main/service/reassign_controller');
 require('controllers/main/service/item');
 var batchUtils = require('utils/batch_scheduled_requests');
 var testHelpers = require('test/helpers');
-var stackSerivceModel = {
+var stackServiceModel = {
   'HDFS': Em.Object.create({
 serviceName: 'HDFS',
 requiredServices: ['ZOOKEEPER']
@@ -1352,7 +1352,7 @@ describe('App.MainServiceItemController', function () {
 beforeEach(function() {
   mainServiceItemController = App.MainServiceItemController.create({});
   sinon.stub(App.StackService, 'find', function (serviceName) {
-return stackSerivceModel[serviceName];
+return stackServiceModel[serviceName];
   });
   this.mockService = sinon.stub(App.Service, 'find');
 });
@@ -1644,7 +1644,7 @@ describe('App.MainServiceItemController', function () {
 
 beforeEach(function() {
   sinon.stub(App.StackService, 'find', function (serviceName) {
-return stackSerivceModel[serviceName];
+return stackServiceModel[serviceName];
   });
   mainServiceItemController = App.MainServiceItemController.create({
 content: {}
@@ -1802,6 +1802,54 @@ describe('App.MainServiceItemController', function () {
 });
   });
 
+  describe('#confirmServiceDeletion', function () {
+
+var mainServiceItemController = 
App.MainServiceItemController.create({deleteServiceProgressPopup: null});
+
+[
+  {
+content: Em.Object.create({serviceName: 'DRUID'}),
+stackServices: [
+  Em.Object.create({id: 'DRUID', displayName: 'Druid', serviceName: 
'DRUID', requiredServices: []})
+],
+m: 'No required services',
+e: 
Em.I18n.t('services.service.delete.service.success.confirmation').format('Druid')
+  },
+  {
+content: Em.Object.create({serviceName: 'MAPREDUCE2'}),
+stackServices: [
+  

[45/50] [abbrv] ambari git commit: AMBARI-19795 Ambari upgrade to not add ranger plugin configs under ranger plugin supported services (mugdha)

[ncole]

AMBARI-19795 Ambari upgrade to not add ranger plugin configs under ranger 
plugin supported services (mugdha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/94d9361e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94d9361e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94d9361e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 94d9361ef649459894a0119862ec34e652e1e792
Parents: 309d9fd
Author: Mugdha Varadkar 
Authored: Fri Feb 3 15:15:11 2017 +0530
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 .../0.9.0/configuration/ranger-kafka-audit.xml  | 32 -
 .../ranger-kafka-plugin-properties.xml  | 14 ++--
 .../ranger-kafka-policymgr-ssl.xml  | 12 ++--
 .../configuration/ranger-kafka-security.xml | 12 ++--
 .../ranger-knox-plugin-properties.xml   | 12 ++--
 .../0.10.0/configuration/ranger-storm-audit.xml | 32 -
 .../ranger-storm-policymgr-ssl.xml  | 12 ++--
 .../configuration/ranger-storm-security.xml | 12 ++--
 .../ranger-storm-plugin-properties.xml  | 71 
 .../ranger-hbase-plugin-properties.xml  | 10 +--
 .../ranger-hdfs-plugin-properties.xml   | 12 ++--
 .../ranger-hive-plugin-properties.xml   | 10 +--
 .../ranger-knox-plugin-properties.xml   |  2 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  | 32 -
 .../ranger-hbase-policymgr-ssl.xml  | 12 ++--
 .../configuration/ranger-hbase-security.xml | 14 ++--
 .../configuration/ranger-hdfs-policymgr-ssl.xml | 12 ++--
 .../HDFS/configuration/ranger-hdfs-security.xml | 14 ++--
 .../HIVE/configuration/ranger-hive-audit.xml| 32 -
 .../configuration/ranger-hive-policymgr-ssl.xml | 12 ++--
 .../HIVE/configuration/ranger-hive-security.xml | 14 ++--
 .../ranger-kafka-policymgr-ssl.xml  |  4 +-
 .../KNOX/configuration/ranger-knox-audit.xml| 32 -
 .../configuration/ranger-knox-policymgr-ssl.xml | 12 ++--
 .../KNOX/configuration/ranger-knox-security.xml | 12 ++--
 .../ranger-storm-policymgr-ssl.xml  |  4 +-
 .../configuration/ranger-storm-security.xml |  2 +-
 .../YARN/configuration/ranger-yarn-audit.xml| 32 -
 .../ranger-yarn-plugin-properties.xml   | 12 ++--
 .../configuration/ranger-yarn-policymgr-ssl.xml | 12 ++--
 .../YARN/configuration/ranger-yarn-security.xml | 12 ++--
 .../ATLAS/configuration/ranger-atlas-audit.xml  | 18 ++---
 .../ranger-atlas-plugin-properties.xml  | 58 ++--
 .../ranger-atlas-policymgr-ssl.xml  | 12 ++--
 .../configuration/ranger-atlas-security.xml | 14 ++--
 .../ranger-hbase-plugin-properties.xml  | 71 
 .../ranger-hdfs-plugin-properties.xml   | 50 +-
 .../ranger-hive-plugin-properties.xml   | 71 
 .../HIVE/configuration/ranger-hive-security.xml |  2 +-
 .../ranger-kafka-plugin-properties.xml  | 71 
 .../ranger-knox-plugin-properties.xml   | 71 
 .../ranger-storm-policymgr-ssl.xml  |  4 +-
 .../configuration/ranger-storm-security.xml |  2 +-
 .../ranger-yarn-plugin-properties.xml   | 71 
 .../ranger-atlas-plugin-properties.xml  | 71 
 .../ranger-hbase-plugin-properties.xml  | 71 
 .../ranger-hdfs-plugin-properties.xml   | 70 +++
 .../ranger-hive-plugin-properties.xml   | 71 
 .../ranger-kafka-plugin-properties.xml  | 71 
 .../ranger-knox-plugin-properties.xml   | 71 
 .../ranger-storm-plugin-properties.xml  | 71 
 .../ranger-yarn-plugin-properties.xml   | 71 
 52 files changed, 823 insertions(+), 778 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/94d9361e/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
index 5257549..b4c0790 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
@@ -23,7 +23,7 @@
 xasecure.audit.is.enabled
 true
 Is Audit enabled?
-
+
   
   
 

[39/50] [abbrv] ambari git commit: AMBARI-19855 Stack advisor issues encountered (dsen)

[ncole]

AMBARI-19855 Stack advisor issues encountered (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b0c93e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b0c93e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b0c93e9

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4b0c93e96edc1f34b69a5c33fae22c08e94f21d2
Parents: d222f57
Author: Dmytro Sen 
Authored: Fri Feb 3 17:14:17 2017 +0200
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:35 2017 -0500

--
 .../common-services/YARN/3.0.0.3.0/service_advisor.py| 8 
 .../main/resources/stacks/HDP/2.2/services/stack_advisor.py  | 8 
 .../resources/stacks/HDPWIN/2.2/services/stack_advisor.py| 8 
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py  | 7 ---
 4 files changed, 16 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b0c93e9/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
index 44bdf80..30dd474 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
@@ -335,10 +335,10 @@ class YARNRecommender(service_advisor.ServiceAdvisor):
 putYarnPropertyAttribute = self.putPropertyAttribute(configurations, 
"yarn-site")
 nodeManagerHost = self.getHostWithComponent("YARN", "NODEMANAGER", 
services, hosts)
 if (nodeManagerHost is not None):
-  cpuPercentageLimit = 0.8
-  if "yarn.nodemanager.resource.percentage-physical-cpu-limit" in 
configurations["yarn-site"]["properties"]:
-cpuPercentageLimit = 
float(configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"])
-  cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * 
cpuPercentageLimit)))
+  cpuPercentageLimit = 80.0
+  if "yarn-site" in services["configurations"] and 
"yarn.nodemanager.resource.percentage-physical-cpu-limit" in 
services["configurations"]["yarn-site"]["properties"]:
+cpuPercentageLimit = 
float(services["configurations"]["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"])
+  cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * 
(cpuPercentageLimit / 100.0
   putYarnProperty('yarn.nodemanager.resource.cpu-vcores', str(cpuLimit))
   putYarnProperty('yarn.scheduler.maximum-allocation-vcores', 
configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.cpu-vcores"])
   putYarnPropertyAttribute('yarn.nodemanager.resource.memory-mb', 
'maximum', int(nodeManagerHost["Hosts"]["total_mem"] / 1024)) # total_mem in kb

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b0c93e9/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index cba611c..421d3d4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -141,10 +141,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 putYarnPropertyAttribute = self.putPropertyAttribute(configurations, 
"yarn-site")
 nodeManagerHost = self.getHostWithComponent("YARN", "NODEMANAGER", 
services, hosts)
 if (nodeManagerHost is not None):
-  cpuPercentageLimit = 0.8
-  if "yarn.nodemanager.resource.percentage-physical-cpu-limit" in 
configurations["yarn-site"]["properties"]:
-cpuPercentageLimit = 
float(configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"])
-  cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * 
cpuPercentageLimit)))
+  cpuPercentageLimit = 80.0
+  if "yarn-site" in services["configurations"] and 
"yarn.nodemanager.resource.percentage-physical-cpu-limit" in 
services["configurations"]["yarn-site"]["properties"]:
+cpuPercentageLimit = 
float(services["configurations"]["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"])
+  cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * 
(cpuPercentageLimit / 100.0
   putYarnProperty('yarn.nodemanager.resource.cpu-vcores', str(cpuLimit))
  

[46/50] [abbrv] ambari git commit: AMBARI-19867. Grafana install fails if custom directory's parent does not exist. (Attila Doroszlai via stoader)

[ncole]

AMBARI-19867. Grafana install fails if custom directory's parent does not 
exist. (Attila Doroszlai via stoader)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ce8641e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ce8641e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ce8641e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4ce8641e9da2ddca2f3a4b137f2860d2e6ed0ec5
Parents: 1756ce5
Author: Attila Doroszlai 
Authored: Mon Feb 6 15:42:29 2017 +0100
Committer: Nate Cole 
Committed: Mon Feb 13 15:45:36 2017 -0500

--
 .../common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py | 1 +
 .../test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ce8641e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index c3bc600..2886e94 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -423,6 +423,7 @@ def ams(name=None, action=None):
 owner=params.ams_user,
 group=params.user_group,
 mode=0755,
+create_parents = True,
 recursive_ownership = True
 )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ce8641e/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
 
b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
index 07b27a6..dc064e4 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
@@ -91,6 +91,7 @@ class TestMetricsGrafana(RMFTestCase):
   owner = 'ams',
   group = 'hadoop',
   mode=0755,
+  create_parents = True,
   recursive_ownership = True
   )
 

[05/50] [abbrv] ambari git commit: AMBARI-19904. Upgrade: Package Install stuck in Installing state forever. (stoader)

[ncole]

AMBARI-19904. Upgrade: Package Install stuck in Installing state forever. 
(stoader)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33caec24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33caec24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33caec24

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 33caec24a8742666a7190f38f5ebd71c54b2a405
Parents: a0ba7fb
Author: Toader, Sebastian 
Authored: Fri Feb 10 18:38:37 2017 +0100
Committer: Toader, Sebastian 
Committed: Fri Feb 10 18:38:37 2017 +0100

--
 .../server/actionmanager/ActionDBAccessor.java  |  5 +-
 .../actionmanager/ActionDBAccessorImpl.java |  6 +-
 .../server/actionmanager/ActionScheduler.java   | 15 ++---
 .../actionmanager/TestActionScheduler.java  | 65 +++-
 4 files changed, 66 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
index 8aef70d..217fe0a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.CommandReport;
 import org.apache.ambari.server.agent.ExecutionCommand;
+import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
 import org.apache.ambari.server.orm.entities.RequestEntity;
 
 public interface ActionDBAccessor {
@@ -58,8 +59,10 @@ public interface ActionDBAccessor {
* Abort all outstanding operations associated with the given request. This
* method uses the {@link HostRoleStatus#SCHEDULED_STATES} to determine which
* {@link HostRoleCommand} instances to abort.
+   *
+   * Returns the list of the aborted operations.
*/
-  public void abortOperation(long requestId);
+  public Collection abortOperation(long requestId);
 
   /**
* Mark the task as to have timed out

http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 7837a7b..7881a4b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -202,7 +202,7 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
* {@inheritDoc}
*/
   @Override
-  public void abortOperation(long requestId) {
+  public Collection abortOperation(long requestId) {
 long now = System.currentTimeMillis();
 
 endRequest(requestId);
@@ -226,8 +226,10 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
 
 // no need to merge if there's nothing to merge
 if (!commands.isEmpty()) {
-  hostRoleCommandDAO.mergeAll(commands);
+  return hostRoleCommandDAO.mergeAll(commands);
 }
+
+return Collections.emptyList();
   }
 
   /* (non-Javadoc)

http://git-wip-us.apache.org/repos/asf/ambari/blob/33caec24/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index fa2ad4f..680c0a6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -929,15 +929,16 @@ class ActionScheduler implements Runnable {
 ExecutionCommand c = wrapper.getExecutionCommand();
 transitionToFailedState(stage.getClusterName(), c.getServiceName(),
 c.getRole(), hostName, now, true);
-if (c.getRoleCommand().equals(RoleCommand.ACTIONEXECUTE)) {
-  String clusterName = c.getClusterName();
-  processActionDeath(clusterName,
-  c.getHostname(),
-  

[03/50] [abbrv] ambari git commit: AMBARI-19960 No config properties are changed after deleting service if it's performed after service page refresh. (ababiichuk)

[ncole]

AMBARI-19960 No config properties are changed after deleting service if it's 
performed after service page refresh. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eecb5a31
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eecb5a31
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eecb5a31

Branch: refs/heads/branch-dev-patch-upgrade
Commit: eecb5a311626f2bab09688d37949f0ccedde86a8
Parents: c9bea4a
Author: ababiichuk 
Authored: Fri Feb 10 16:02:12 2017 +0200
Committer: ababiichuk 
Committed: Fri Feb 10 18:22:30 2017 +0200

--
 ambari-web/app/controllers/main/service/item.js | 67 +++-
 .../test/controllers/main/service/item_test.js  | 46 +-
 2 files changed, 81 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eecb5a31/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 7010ab5..a7ed493 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -144,8 +144,9 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @type {String[]}
*/
   dependentServiceNames: function() {
-return 
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames');
-  }.property('content.serviceName'),
+return App.get('router.clusterController.isConfigsPropertiesLoaded') ?
+  
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames')
 : [];
+  }.property('content.serviceName', 
'App.router.clusterController.isConfigsPropertiesLoaded'),
 
   /**
* List of service names that could be deleted
@@ -204,32 +205,35 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
*/
   onLoadConfigsTags: function (data) {
 var self = this;
-var sitesToLoad = this.get('sitesToLoad'), allConfigs = [];
-var loadedSites = data.Clusters.desired_configs;
-var siteTagsToLoad = [];
-for (var site in loadedSites) {
-  if (sitesToLoad.contains(site)) {
-siteTagsToLoad.push({
-  siteName: site,
-  tagName: loadedSites[site].tag
-});
+
App.get('router.mainController.isLoading').call(App.get('router.clusterController'),
 'isConfigsPropertiesLoaded').done(function () {
+  var sitesToLoad = self.get('sitesToLoad'),
+allConfigs = [],
+loadedSites = data.Clusters.desired_configs,
+siteTagsToLoad = [];
+  for (var site in loadedSites) {
+if (sitesToLoad.contains(site)) {
+  siteTagsToLoad.push({
+siteName: site,
+tagName: loadedSites[site].tag
+  });
+}
   }
-}
-
App.router.get('configurationController').getConfigsByTags(siteTagsToLoad).done(function
 (configs) {
-  configs.forEach(function (site) {
-self.get('configs')[site.type] = site.properties;
-allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
-  });
+  
App.router.get('configurationController').getConfigsByTags(siteTagsToLoad).done(function
 (configs) {
+configs.forEach(function (site) {
+  self.get('configs')[site.type] = site.properties;
+  allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
+});
 
-  self.get('dependentServiceNames').forEach(function(serviceName) {
-var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
-var configsByService = allConfigs.filter(function (c) {
-  return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
+self.get('dependentServiceNames').forEach(function(serviceName) {
+  var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
+  var configsByService = allConfigs.filter(function (c) {
+return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
+  });
+  
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
 });
-
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
-  });
 
-  self.set('isServiceConfigsLoaded', true);
+self.set('isServiceConfigsLoaded', true);
+  });
 });
   },
 
@@ -1290,7 +1294,13 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   popupHeader = Em.I18n.t('services.service.delete.popup.header'),
   

[08/50] [abbrv] ambari git commit: AMBARI-19831. ADDENDUM. HDP 3.0 TP - Support changed configs and scripts for YARN/MR (alejandro)

[ncole]

AMBARI-19831. ADDENDUM. HDP 3.0 TP - Support changed configs and scripts for 
YARN/MR (alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4381561f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4381561f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4381561f

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4381561f92aeb91b1a2b3cafff4a860efde81dff
Parents: e8a9961
Author: Alejandro Fernandez 
Authored: Fri Feb 10 13:09:12 2017 -0800
Committer: Alejandro Fernandez 
Committed: Fri Feb 10 13:16:34 2017 -0800

--
 .../common-services/YARN/3.0.0.3.0/package/scripts/service.py| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4381561f/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
index 78b2428..e0d6475 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py
@@ -44,7 +44,7 @@ def service(componentName, action='start', 
serviceName='yarn'):
   if serviceName == 'mapreduce' and componentName == 'historyserver':
 delete_pid_file = True
 daemon = format("{mapred_bin}/mr-jobhistory-daemon.sh")
-pid_file = 
format("{mapred_pid_dir}/mapred-{mapred_user}-{componentName}.pid")
+pid_file = 
format("{mapred_pid_dir}/hadoop-{mapred_user}-{componentName}.pid")
 usr = params.mapred_user
 log_dir = params.mapred_log_dir
   else:
@@ -52,7 +52,7 @@ def service(componentName, action='start', 
serviceName='yarn'):
 # may not work correctly when stopping the service
 delete_pid_file = False
 daemon = format("{yarn_bin}/yarn-daemon.sh")
-pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-{componentName}.pid")
+pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-{componentName}.pid")
 usr = params.yarn_user
 log_dir = params.yarn_log_dir