[ambari] branch branch-feature-AMBARI-14714 updated (aec7278 -> be5a903)
This is an automated email from the ASF dual-hosted git repository. swapan pushed a change to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git. from aec7278 Test fix post trunk merge. add c5dd057 AMBARI-24493. Skipping Ambari Server Python UTs as builds are failing. (AMBARI-24427 tracks fixing it) new be5a903 AMBARI-24493. Skipping Ambari Server Python UTs as builds are failing (AMBARI-24427 tracks fixing it) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-server/src/test/python/TestServiceAdvisor.py| 2 ++ ambari-server/src/test/python/TestStackFeature.py | 2 ++ ambari-server/src/test/python/TestStackSelect.py | 2 ++ ambari-server/src/test/python/custom_actions/TestRemoveBits.py | 3 ++- ambari-server/src/test/python/custom_actions/test_mpack_install.py | 2 ++ .../test/python/stacks/stack-hooks/after-INSTALL/test_after_install.py | 2 ++ .../src/test/python/stacks/stack-hooks/before-ANY/test_before_any.py | 2 ++ .../python/stacks/stack-hooks/before-INSTALL/test_before_install.py| 2 ++ .../stacks/stack-hooks/before-SET_KEYTAB/test_before_set_keytab.py | 2 ++ .../test/python/stacks/stack-hooks/before-START/test_before_start.py | 2 ++ 10 files changed, 20 insertions(+), 1 deletion(-)
[ambari] 01/01: AMBARI-24493. Skipping Ambari Server Python UTs as builds are failing (AMBARI-24427 tracks fixing it)
This is an automated email from the ASF dual-hosted git repository. swapan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git commit be5a903a3a86cac8bb831706403f05826d51764b Merge: aec7278 c5dd057 Author: swapanshridhar AuthorDate: Thu Aug 16 19:12:27 2018 -0700 AMBARI-24493. Skipping Ambari Server Python UTs as builds are failing (AMBARI-24427 tracks fixing it) AMBARI-24493. Skipping Ambari Server Python UTs as builds are failing (AMBARI-24427 tracks fixing it) ambari-server/src/test/python/TestServiceAdvisor.py| 2 ++ ambari-server/src/test/python/TestStackFeature.py | 2 ++ ambari-server/src/test/python/TestStackSelect.py | 2 ++ ambari-server/src/test/python/custom_actions/TestRemoveBits.py | 3 ++- ambari-server/src/test/python/custom_actions/test_mpack_install.py | 2 ++ .../test/python/stacks/stack-hooks/after-INSTALL/test_after_install.py | 2 ++ .../src/test/python/stacks/stack-hooks/before-ANY/test_before_any.py | 2 ++ .../python/stacks/stack-hooks/before-INSTALL/test_before_install.py| 2 ++ .../stacks/stack-hooks/before-SET_KEYTAB/test_before_set_keytab.py | 2 ++ .../test/python/stacks/stack-hooks/before-START/test_before_start.py | 2 ++ 10 files changed, 20 insertions(+), 1 deletion(-)
[ambari] 01/01: Test fix post trunk merge.
This is an automated email from the ASF dual-hosted git repository. swapan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git commit aec72781892e9346f5b187afb85d97a533145cbb Merge: e920e6b 2583826 Author: swapanshridhar AuthorDate: Thu Aug 16 16:58:19 2018 -0700 Test fix post trunk merge. Test fix post trunk merge. ambari-web/app/controllers/wizard/step7/assign_master_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[ambari] branch branch-feature-AMBARI-14714 updated (e920e6b -> aec7278)
This is an automated email from the ASF dual-hosted git repository. swapan pushed a change to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git. from e920e6b Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)" add 2583826 Test fix post trunk merge. new aec7278 Test fix post trunk merge. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/controllers/wizard/step7/assign_master_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[ambari] 01/01: Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)"
This is an automated email from the ASF dual-hosted git repository. swapan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git commit e920e6b49190b092dcadaee9873bd480a846c1d3 Merge: b1e9369 a2b6a2d Author: swapanshridhar AuthorDate: Thu Aug 16 14:13:00 2018 -0700 Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)" Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)" ambari-admin/pom.xml | 2 ++ .../src/main/resources/ui/admin-web/package.json | 9 +++--- .../test/unit/controllers/AppCtrl_test.js | 17 +- .../controllers/ClusterInformationCtrl_test.js | 6 ++-- .../stackVersions/StackversionsListCtrl_test.js| 2 +- .../test/unit/directives/comboSearch_test.js | 2 +- .../test/unit/directives/editablelist_test.js | 37 +- .../test/unit/services/AddRepositoryModal_test.js | 2 +- .../test/unit/services/PermissionSaver_test.js | 8 ++--- .../test/unit/services/UnsavedDialog__test.js | 2 +- .../admin-web/test/unit/services/Utility_test.js | 8 ++--- 11 files changed, 38 insertions(+), 57 deletions(-)
[ambari] branch branch-feature-AMBARI-14714 updated (b1e9369 -> e920e6b)
This is an automated email from the ASF dual-hosted git repository. swapan pushed a change to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git. from b1e9369 [AMBARI-24481] Orchestration: Remove singular upgrade pack from UpgradeContext; resolve ServiceGroup names (#2081) add a2b6a2d Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)" new e920e6b Revert "AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-admin/pom.xml | 2 ++ .../src/main/resources/ui/admin-web/package.json | 9 +++--- .../test/unit/controllers/AppCtrl_test.js | 17 +- .../controllers/ClusterInformationCtrl_test.js | 6 ++-- .../stackVersions/StackversionsListCtrl_test.js| 2 +- .../test/unit/directives/comboSearch_test.js | 2 +- .../test/unit/directives/editablelist_test.js | 37 +- .../test/unit/services/AddRepositoryModal_test.js | 2 +- .../test/unit/services/PermissionSaver_test.js | 8 ++--- .../test/unit/services/UnsavedDialog__test.js | 2 +- .../admin-web/test/unit/services/Utility_test.js | 8 ++--- 11 files changed, 38 insertions(+), 57 deletions(-)
[ambari] branch branch-2.7 updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new b5ceae4 [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in
YARN configs while enabling HSI.
b5ceae4 is described below
commit b5ceae4f84691a9b838da720371e67b81e6adbce
Author: Ishan Bhatt
AuthorDate: Thu Aug 16 09:23:14 2018 -0700
[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs
while enabling HSI.
---
.../common/configs/config_recommendation_parser.js | 47 +-
1 file changed, 2 insertions(+), 45 deletions(-)
diff --git
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 19ea8a5..6bcd322 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,14 +170,10 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
}
}
- if (prevRecommeneded !== value) {
+ if (prevRecommeneded !== value && name !== "capacity-scheduler") {
allowConfigUpdate = false;
}
- if (name === "capacity-scheduler") {
-allowConfigUpdate =
this.compareCapacitySchedulerValues(prevRecommeneded, value);
- }
-
if (allowConfigUpdate) {
Em.setProperties(config, {
value: recommendedValue,
@@ -196,46 +192,7 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
Em.tryInvoke(config, 'validate');
return config;
},
-
- /**
- * Configs with value across multiple lines could have them in a different
order
- * Eg: capacity-scheduler
- *
- * @param {String} prevRec
- * @param {String} value
- * @returns {Boolean}
- * @method isPrevRecAndValueEqual
- */
-
- compareCapacitySchedulerValues: function (prevRec, value) {
-
-
-let prevRecArr = prevRec.split("\n");
-let valueArr = value.split("\n");
-
-//first value being added is capacity-scheduler=null. Remove that for
comparison
-if (valueArr[0].includes("capacity-scheduler")) {
- valueArr = valueArr.splice(1);
-}
-
-if (prevRecArr.length !== valueArr.length) {
- return false;
-}
-if (prevRecArr.length < 2 || valueArr.length < 2) {
- return prevRec === value;
-}
-let strMap = {};
-for (var i=0; i
[ambari] branch trunk updated: [AMBARI-24485] HDP-3.0 Hive Interactive server fails to start. (#2098)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new bff6d0e [AMBARI-24485] HDP-3.0 Hive Interactive server fails to
start. (#2098)
bff6d0e is described below
commit bff6d0e86a29a2a57b7f6903778012cff079c2b4
Author: avijayanhwx
AuthorDate: Thu Aug 16 11:04:31 2018 -0700
[AMBARI-24485] HDP-3.0 Hive Interactive server fails to start. (#2098)
---
ambari-server/src/main/resources/scripts/Ambaripreupload.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index b5ab101..5e9688c 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -254,6 +254,7 @@ with Environment() as env:
params.HdfsResource(format('{hdfs_path_prefix}/hive/warehouse'),
owner='hive', type='directory', action=['create_on_execute'], mode=0777)
params.HdfsResource(format('{hdfs_path_prefix}/warehouse/tablespace/external/hive'),
owner='hive', type='directory', action=['create_on_execute'], mode=01777)
params.HdfsResource(format('{hdfs_path_prefix}/user/hive'), owner='hive',
type='directory', action=['create_on_execute'], mode=0755)
+
params.HdfsResource(format('{hdfs_path_prefix}/user/hive/.yarn/package/LLAP'),
owner='hive', type='directory', action=['create_on_execute'], mode=0755)
params.HdfsResource(format('{hdfs_path_prefix}/tmp'), mode=0777,
action=['create_on_execute'], type='directory', owner='hdfs')
params.HdfsResource(format('{hdfs_path_prefix}/user/ambari-qa'),
type='directory', action=['create_on_execute'], mode=0770)
params.HdfsResource(format('{hdfs_path_prefix}/user/oozie'),
owner='oozie', type='directory', action=['create_on_execute'], mode=0775)
[ambari] branch trunk updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9d525af [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in
YARN configs while enabling HSI.
9d525af is described below
commit 9d525af84f38d0791e32fe1f04c747c284785932
Author: Ishan Bhatt
AuthorDate: Thu Aug 16 09:23:14 2018 -0700
[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs
while enabling HSI.
---
.../common/configs/config_recommendation_parser.js | 47 +-
1 file changed, 2 insertions(+), 45 deletions(-)
diff --git
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 19ea8a5..6bcd322 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,14 +170,10 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
}
}
- if (prevRecommeneded !== value) {
+ if (prevRecommeneded !== value && name !== "capacity-scheduler") {
allowConfigUpdate = false;
}
- if (name === "capacity-scheduler") {
-allowConfigUpdate =
this.compareCapacitySchedulerValues(prevRecommeneded, value);
- }
-
if (allowConfigUpdate) {
Em.setProperties(config, {
value: recommendedValue,
@@ -196,46 +192,7 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
Em.tryInvoke(config, 'validate');
return config;
},
-
- /**
- * Configs with value across multiple lines could have them in a different
order
- * Eg: capacity-scheduler
- *
- * @param {String} prevRec
- * @param {String} value
- * @returns {Boolean}
- * @method isPrevRecAndValueEqual
- */
-
- compareCapacitySchedulerValues: function (prevRec, value) {
-
-
-let prevRecArr = prevRec.split("\n");
-let valueArr = value.split("\n");
-
-//first value being added is capacity-scheduler=null. Remove that for
comparison
-if (valueArr[0].includes("capacity-scheduler")) {
- valueArr = valueArr.splice(1);
-}
-
-if (prevRecArr.length !== valueArr.length) {
- return false;
-}
-if (prevRecArr.length < 2 || valueArr.length < 2) {
- return prevRec === value;
-}
-let strMap = {};
-for (var i=0; i
[ambari] branch trunk updated: Fixed Spelling. (#1918)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 99c9070 Fixed Spelling. (#1918)
99c9070 is described below
commit 99c9070b2ac2774da5e1b41f46a15e0ffd1cd9fb
Author: Jimmy Casey
AuthorDate: Thu Aug 16 17:04:55 2018 +0100
Fixed Spelling. (#1918)
---
ambari-common/src/test/python/coilmq/scheduler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-common/src/test/python/coilmq/scheduler.py
b/ambari-common/src/test/python/coilmq/scheduler.py
index 4ac7c3e..013de47 100644
--- a/ambari-common/src/test/python/coilmq/scheduler.py
+++ b/ambari-common/src/test/python/coilmq/scheduler.py
@@ -32,7 +32,7 @@ class SubscriberPriorityScheduler(object):
@abc.abstractmethod
def choice(self, subscribers, message):
"""
-Chooses which subscriber (from list) should recieve specified message.
+Chooses which subscriber (from list) should receive specified message.
@param subscribers: Collection of subscribed connections eligible to
receive message.
@type subscribers: C{list} of L{coilmq.server.StompConnection}
[ambari] branch branch-2.7 updated: [AMBARI-24485] HDP-3.0 Hive Interactive server fails to start. (#2084)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 5ccda35 [AMBARI-24485] HDP-3.0 Hive Interactive server fails to
start. (#2084)
5ccda35 is described below
commit 5ccda3504f75b614dd912825e2547dd4f8222908
Author: avijayanhwx
AuthorDate: Thu Aug 16 07:30:22 2018 -0700
[AMBARI-24485] HDP-3.0 Hive Interactive server fails to start. (#2084)
---
ambari-server/src/main/resources/scripts/Ambaripreupload.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index b5ab101..5e9688c 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -254,6 +254,7 @@ with Environment() as env:
params.HdfsResource(format('{hdfs_path_prefix}/hive/warehouse'),
owner='hive', type='directory', action=['create_on_execute'], mode=0777)
params.HdfsResource(format('{hdfs_path_prefix}/warehouse/tablespace/external/hive'),
owner='hive', type='directory', action=['create_on_execute'], mode=01777)
params.HdfsResource(format('{hdfs_path_prefix}/user/hive'), owner='hive',
type='directory', action=['create_on_execute'], mode=0755)
+
params.HdfsResource(format('{hdfs_path_prefix}/user/hive/.yarn/package/LLAP'),
owner='hive', type='directory', action=['create_on_execute'], mode=0755)
params.HdfsResource(format('{hdfs_path_prefix}/tmp'), mode=0777,
action=['create_on_execute'], type='directory', owner='hdfs')
params.HdfsResource(format('{hdfs_path_prefix}/user/ambari-qa'),
type='directory', action=['create_on_execute'], mode=0770)
params.HdfsResource(format('{hdfs_path_prefix}/user/oozie'),
owner='oozie', type='directory', action=['create_on_execute'], mode=0775)
[ambari] branch trunk updated: [AMBARI-24433] [Log Search UI] Reset to default selection in the dropdowns (#2091)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56441eb [AMBARI-24433] [Log Search UI] Reset to default selection in
the dropdowns (#2091)
56441eb is described below
commit 56441eb7679cd5ca15411d0c0c35f6d658187460
Author: Istvan Tobias
AuthorDate: Thu Aug 16 15:57:39 2018 +0200
[AMBARI-24433] [Log Search UI] Reset to default selection in the dropdowns
(#2091)
---
.../service-logs-table.component.html | 6 ++-
.../dropdown-button/dropdown-button.component.html | 7 +--
.../dropdown-button/dropdown-button.component.ts | 27 ++
.../dropdown-list/dropdown-list.component.html | 9 ++--
.../dropdown-list/dropdown-list.component.less | 23 +++-
.../dropdown-list/dropdown-list.component.ts | 61 +-
.../ambari-logsearch-web/src/assets/i18n/en.json | 1 +
7 files changed, 102 insertions(+), 32 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
index cacee46..fb8a9b4 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
@@ -28,8 +28,10 @@
[isRightAlign]="true">
+ (selectItem)="updateSelectedColumns($event)"
+ [listItemArguments]="logsTypeMapObject.fieldsModel"
+ [isMultipleChoice]="true"
+ [useClearToDefaultSelection]="true">
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
index 396a277..7140028 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
@@ -29,7 +29,8 @@
-
+
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
index 837d03a..534b69d 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
@@ -31,36 +31,41 @@ export class DropdownButtonComponent {
label?: string;
@Input()
- buttonClass: string = 'btn-link';
+ buttonClass = 'btn-link';
@Input()
iconClass?: string;
@Input()
- hideCaret: boolean = false;
+ hideCaret = false;
@Input()
- showSelectedValue: boolean = true;
+ showSelectedValue = true;
- @Input() options: ListItem[] = [];
+ @Input()
+ isRightAlign = false;
@Input()
- listItemArguments: any[] = [];
+ isDropup = false;
@Input()
- isMultipleChoice: boolean = false;
+ showCommonLabelWithSelection = false;
+
+ @Output()
+ selectItem: EventEmitter = new EventEmitter();
+ // PROXY PROPERTIES TO DROPDOWN LIST COMPONENT
@Input()
- isRightAlign: boolean = false;
+ options: ListItem[] = [];
@Input()
- isDropup: boolean = false;
+ listItemArguments: any[] = [];
@Input()
- showCommonLabelWithSelection: boolean = false;
+ isMultipleChoice = false;
- @Output()
- selectItem: EventEmitter = new EventEmitter();
+ @Input()
+ useClearToDefaultSelection = false;
protected selectedItems?: ListItem[] = [];
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
index 3423f54..a15b1c3 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
@@ -53,9 +53,12 @@
-
-{{'dropdown.selection' | translate:({total:
itemsSelected.length})}}
-{{'dropdown.selection.clear' |
translate}}
+
+{{'dropdown.selection' | translate:({total:
itemsSelected.length})}}
+{{'dropdown.selection.clearToDefault'
|
[ambari] branch branch-2.7 updated: [AMBARI-24433] [Log Search UI] Reset to default selection in the dropdowns (#2092)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 276871b [AMBARI-24433] [Log Search UI] Reset to default selection in
the dropdowns (#2092)
276871b is described below
commit 276871b292bd3538e4428f10290d3aaacc6b2882
Author: Istvan Tobias
AuthorDate: Thu Aug 16 15:57:20 2018 +0200
[AMBARI-24433] [Log Search UI] Reset to default selection in the dropdowns
(#2092)
(cherry picked from commit f40586f601072baadd694988515770531d268738)
---
.../service-logs-table.component.html | 6 ++-
.../dropdown-button/dropdown-button.component.html | 7 +--
.../dropdown-button/dropdown-button.component.ts | 27 ++
.../dropdown-list/dropdown-list.component.html | 9 ++--
.../dropdown-list/dropdown-list.component.less | 23 +++-
.../dropdown-list/dropdown-list.component.ts | 61 +-
.../ambari-logsearch-web/src/assets/i18n/en.json | 1 +
7 files changed, 102 insertions(+), 32 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
index cacee46..fb8a9b4 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
@@ -28,8 +28,10 @@
[isRightAlign]="true">
+ (selectItem)="updateSelectedColumns($event)"
+ [listItemArguments]="logsTypeMapObject.fieldsModel"
+ [isMultipleChoice]="true"
+ [useClearToDefaultSelection]="true">
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
index 396a277..7140028 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.html
@@ -29,7 +29,8 @@
-
+
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
index 837d03a..534b69d 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
@@ -31,36 +31,41 @@ export class DropdownButtonComponent {
label?: string;
@Input()
- buttonClass: string = 'btn-link';
+ buttonClass = 'btn-link';
@Input()
iconClass?: string;
@Input()
- hideCaret: boolean = false;
+ hideCaret = false;
@Input()
- showSelectedValue: boolean = true;
+ showSelectedValue = true;
- @Input() options: ListItem[] = [];
+ @Input()
+ isRightAlign = false;
@Input()
- listItemArguments: any[] = [];
+ isDropup = false;
@Input()
- isMultipleChoice: boolean = false;
+ showCommonLabelWithSelection = false;
+
+ @Output()
+ selectItem: EventEmitter = new EventEmitter();
+ // PROXY PROPERTIES TO DROPDOWN LIST COMPONENT
@Input()
- isRightAlign: boolean = false;
+ options: ListItem[] = [];
@Input()
- isDropup: boolean = false;
+ listItemArguments: any[] = [];
@Input()
- showCommonLabelWithSelection: boolean = false;
+ isMultipleChoice = false;
- @Output()
- selectItem: EventEmitter = new EventEmitter();
+ @Input()
+ useClearToDefaultSelection = false;
protected selectedItems?: ListItem[] = [];
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
index 3423f54..a15b1c3 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.html
@@ -53,9 +53,12 @@
-
-{{'dropdown.selection' | translate:({total:
itemsSelected.length})}}
-{{'dropdown.selection.clear' |
translate}}
+
+{{'dropdown.selection' |
[ambari] branch trunk updated (60d4951 -> 93c5f8e)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 60d4951 [AMBARI-24436] [Log Search UI] App Loader Page - Align the logo left (#2065) add 7ccfd1e AMBARI-24489. Cover activate standby step 3 controller with tests new 93c5f8e Merge pull request #2089 from hiveww/AMBARI-24489-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/assets/test/tests.js| 1 + .../hawq/activateStandby/step3_controller_test.js | 173 + 2 files changed, 174 insertions(+) create mode 100644 ambari-web/test/controllers/main/admin/highAvailability/hawq/activateStandby/step3_controller_test.js
[ambari] 01/01: Merge pull request #2089 from hiveww/AMBARI-24489-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 93c5f8e9d8194dbfed9dffef7e650bc7d6182132 Merge: 60d4951 7ccfd1e Author: Alexander Antonenko AuthorDate: Thu Aug 16 16:41:20 2018 +0300 Merge pull request #2089 from hiveww/AMBARI-24489-trunk AMBARI-24489. Cover activate standby step 3 controller with tests ambari-web/app/assets/test/tests.js| 1 + .../hawq/activateStandby/step3_controller_test.js | 173 + 2 files changed, 174 insertions(+)
[ambari] branch branch-2.7 updated: AMBARI-24486. Yarn Timeline Service V2 Reader is found down after EU (Atlantic to AtlanticM05) With error - Address already in use (amagyar) (#2085) (#2090)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 591bdff AMBARI-24486. Yarn Timeline Service V2 Reader is found down
after EU (Atlantic to AtlanticM05) With error - Address already in use
(amagyar) (#2085) (#2090)
591bdff is described below
commit 591bdff6997d945df671c8bfcc13cc61c74bcc2d
Author: Attila Magyar
AuthorDate: Thu Aug 16 14:02:26 2018 +0200
AMBARI-24486. Yarn Timeline Service V2 Reader is found down after EU
(Atlantic to AtlanticM05) With error - Address already in use (amagyar) (#2085)
(#2090)
---
.../upgrades/FixTimelineReaderAddress.java | 25 ++
.../upgrades/FixTimelineReaderAddressTest.java | 4 ++--
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
index c7ddaa8..e2f5613 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
@@ -49,9 +49,9 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
private static final Logger LOG =
LoggerFactory.getLogger(CreateAndConfigureAction.class);
private static final String YARN_SITE = "yarn-site";
private static final String TIMELINE_READER = "TIMELINE_READER";
- private static final String[] HOST_PROPERTIES = new String[] {
-"yarn.timeline-service.reader.webapp.address",
-"yarn.timeline-service.reader.webapp.https.address"
+ private static final String HTTP_ADDRESS =
"yarn.timeline-service.reader.webapp.address";
+ private static final String HTTPS_ADDRESS =
"yarn.timeline-service.reader.webapp.https.address";
+ private static final String[] HOST_PROPERTIES = new String[] {HTTP_ADDRESS,
HTTPS_ADDRESS
};
@Override
@@ -68,7 +68,7 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
if (oldHost == null) {
continue;
}
-String newHost = oldHost.replace("localhost", hostNameOf(cluster,
"YARN", TIMELINE_READER));
+String newHost = replace(oldHost, hostNameOf(cluster, "YARN",
TIMELINE_READER), defaultPort(propertyName));
updatedHosts.add(newHost);
updateConfig(cluster, propertyName, newHost, config);
}
@@ -78,6 +78,23 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
}
}
+ private int defaultPort(String propertyName) {
+switch (propertyName) {
+ case HTTP_ADDRESS: return 8198;
+ case HTTPS_ADDRESS: return 8199;
+ default: throw new IllegalArgumentException("Unknown property: " +
propertyName);
+}
+ }
+
+ private String replace(String oldHost, String newHost, int defaultPort) {
+if (oldHost.contains(":")) {
+ String hostPart = oldHost.split(":")[0];
+ return oldHost.replace(hostPart, newHost);
+} else {
+ return newHost + ":" + defaultPort;
+}
+ }
+
private void updateConfig(Cluster cluster, String propertyName, String
propertyValue, Config config) throws AmbariException {
Map newProperties = new HashMap<>();
newProperties.put(propertyName, propertyValue);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
index 14bd0f7..eb0b68e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
@@ -67,7 +67,7 @@ public class FixTimelineReaderAddressTest extends
EasyMockSupport {
expect(cluster.getDesiredConfigByType("yarn-site")).andReturn(config).anyTimes();
expect(config.getProperties()).andReturn(new HashMap() {{
put("yarn.timeline-service.reader.webapp.address", "localhost:8080");
- put("yarn.timeline-service.reader.webapp.https.address",
"localhost:8081");
+ put("yarn.timeline-service.reader.webapp.https.address",
"{{timeline_reader_address_https}}");
}}).anyTimes();
expect(yarn.getServiceComponent("TIMELINE_READER")).andReturn(timelineReader).anyTimes();
expect(timelineReader.getServiceComponentHosts()).andReturn(new
HashMap(){{
@@ -82,7 +82,7 @@ public class FixTimelineReaderAddressTest extends
EasyMockSupport {
}});
expectLastCall();
config.updateProperties(new HashMap() {{
-
[ambari] branch branch-2.7 updated: [AMBARI-24436] [Log Search UI] App Loader Page - Align the logo left (#2066)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 50a30aa [AMBARI-24436] [Log Search UI] App Loader Page - Align the
logo left (#2066)
50a30aa is described below
commit 50a30aab0ae9a6d95fa87fca216fd268ffef7c7f
Author: Istvan Tobias
AuthorDate: Thu Aug 16 13:25:24 2018 +0200
[AMBARI-24436] [Log Search UI] App Loader Page - Align the logo left (#2066)
(cherry picked from commit 0096119ffd8ba3b26fa260de1b84fa545c3d503a)
---
.../ambari-logsearch-web/src/app/components/app.component.html | 2 +-
.../ambari-logsearch-web/src/app/components/app.component.less | 1 -
.../ambari-logsearch-web/src/app/components/app.component.ts| 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
index a40b0c4..c9f8313 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
@@ -17,7 +17,7 @@
-{{'common.title' | translate}}
+{{'common.title' | translate}}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
index aaa18ed..b9eb907 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
@@ -29,7 +29,6 @@
border-radius: 0;
color: #fff;
margin-bottom: 0;
-justify-content: center;
.stretch-flex;
h1 {
align-items: center;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
index c711a48..09a82c2 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
@@ -34,7 +34,7 @@ export class AppComponent {
isBaseDataAvailable$: Observable =
this.appState.getParameter('baseDataSetState')
.map((dataSetState: DataAvailability) => dataSetState ===
DataAvailabilityValues.AVAILABLE);
- private notificationServiceOptions: Options = {
+ notificationServiceOptions: Options = {
timeOut: 2000,
showProgressBar: true,
pauseOnHover: true,
[ambari] branch trunk updated: [AMBARI-24436] [Log Search UI] App Loader Page - Align the logo left (#2065)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 60d4951 [AMBARI-24436] [Log Search UI] App Loader Page - Align the
logo left (#2065)
60d4951 is described below
commit 60d4951e39ca1960741b9e7577a0b6b9aeb48d51
Author: Istvan Tobias
AuthorDate: Thu Aug 16 13:25:04 2018 +0200
[AMBARI-24436] [Log Search UI] App Loader Page - Align the logo left (#2065)
---
.../ambari-logsearch-web/src/app/components/app.component.html | 2 +-
.../ambari-logsearch-web/src/app/components/app.component.less | 1 -
.../ambari-logsearch-web/src/app/components/app.component.ts| 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
index a40b0c4..c9f8313 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
@@ -17,7 +17,7 @@
-{{'common.title' | translate}}
+{{'common.title' | translate}}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
index aaa18ed..b9eb907 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
@@ -29,7 +29,6 @@
border-radius: 0;
color: #fff;
margin-bottom: 0;
-justify-content: center;
.stretch-flex;
h1 {
align-items: center;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
index c711a48..09a82c2 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.ts
@@ -34,7 +34,7 @@ export class AppComponent {
isBaseDataAvailable$: Observable =
this.appState.getParameter('baseDataSetState')
.map((dataSetState: DataAvailability) => dataSetState ===
DataAvailabilityValues.AVAILABLE);
- private notificationServiceOptions: Options = {
+ notificationServiceOptions: Options = {
timeOut: 2000,
showProgressBar: true,
pauseOnHover: true,
[ambari] branch branch-2.7 updated: [AMBARI-24437] [Log Search UI] App Loader Page - add more space above the loader animations (#2064)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 938c88e [AMBARI-24437] [Log Search UI] App Loader Page - add more
space above the loader animations (#2064)
938c88e is described below
commit 938c88ea7bae8d5b015b9694805135426b63aa05
Author: Istvan Tobias
AuthorDate: Thu Aug 16 13:24:39 2018 +0200
[AMBARI-24437] [Log Search UI] App Loader Page - add more space above the
loader animations (#2064)
(cherry picked from commit b7e2540075a400f7edd8a5b9acbc0d906d2b596b)
---
.../data-loading-indicator/data-loading-indicator.component.less | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
index 513bab7..ac89f38 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
@@ -61,13 +61,13 @@
}
:host {
-
+ height: 80vh;
.data-avaibility {
align-items: center;
align-content: center;
display: flex;
justify-content: center;
-margin: 10px 0 0 0;
+margin: 25vh 0 0 0;
width: 100vw;
.state-item {
align-items: center;
[ambari] branch trunk updated: [AMBARI-24437] [Log Search UI] App Loader Page - add more space above the loader animations (#2063)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 96335ba [AMBARI-24437] [Log Search UI] App Loader Page - add more
space above the loader animations (#2063)
96335ba is described below
commit 96335baaaf29757594bd719ca3adb76ff0eae27b
Author: Istvan Tobias
AuthorDate: Thu Aug 16 13:24:18 2018 +0200
[AMBARI-24437] [Log Search UI] App Loader Page - add more space above the
loader animations (#2063)
---
.../data-loading-indicator/data-loading-indicator.component.less | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
index 513bab7..ac89f38 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.less
@@ -61,13 +61,13 @@
}
:host {
-
+ height: 80vh;
.data-avaibility {
align-items: center;
align-content: center;
display: flex;
justify-content: center;
-margin: 10px 0 0 0;
+margin: 25vh 0 0 0;
width: 100vw;
.state-item {
align-items: center;
[ambari] branch branch-2.7 updated: AMBARI-24488. Ambari Server Upgrade is failing with IndexError: tuple index out of range while running ambari-server upgrade command. (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 81aa4db AMBARI-24488. Ambari Server Upgrade is failing with
IndexError: tuple index out of range while running ambari-server upgrade
command. (aonishuk)
81aa4db is described below
commit 81aa4dbc7b6fd086af28e9f6c70ef5616b478f63
Author: Andrew Onishuk
AuthorDate: Thu Aug 16 11:33:56 2018 +0300
AMBARI-24488. Ambari Server Upgrade is failing with IndexError: tuple index
out of range while running ambari-server upgrade command. (aonishuk)
---
ambari-agent/src/main/package/deb/control/preinst | 2 +-
ambari-agent/src/main/package/rpm/preinstall.sh| 2 +-
ambari-server/src/main/package/deb/control/preinst | 4 ++--
ambari-server/src/main/package/rpm/preinstall.sh | 6 +++---
ambari-server/src/main/python/ambari_server/serverConfiguration.py | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ambari-agent/src/main/package/deb/control/preinst
b/ambari-agent/src/main/package/deb/control/preinst
index ad6153f..7bbb73e 100644
--- a/ambari-agent/src/main/package/deb/control/preinst
+++ b/ambari-agent/src/main/package/deb/control/preinst
@@ -26,7 +26,7 @@ common services
folder::${var_dir}/cache/common-services:${var_dir}/cache/common
ambari-agent.ini::${etc_dir}/conf/ambari-agent.ini:${etc_dir}/conf/ambari-agent.ini.old
sudoers:Please restore the file if you were using it for ambari-agent non-root
functionality:${sudoers_dir}/ambari-agent:${sudoers_dir}/ambari-agent.bak"
- echo ${backup_folders} | while IFS=: read title notes source target; do
+ echo "${backup_folders}" | while IFS=: read title notes source target; do
if [ -d "${source}" ] || [ -f "${source}" ]; then
echo -n "Moving ${title}: ${source} -> ${target}"
if [ ! -z notes ]; then
diff --git a/ambari-agent/src/main/package/rpm/preinstall.sh
b/ambari-agent/src/main/package/rpm/preinstall.sh
index ff6dd3c..5454cdf 100644
--- a/ambari-agent/src/main/package/rpm/preinstall.sh
+++ b/ambari-agent/src/main/package/rpm/preinstall.sh
@@ -26,7 +26,7 @@
ambari-agent.ini::${etc_dir}/conf/ambari-agent.ini:${etc_dir}/conf/ambari-agent.
sudoers:Please restore the file if you were using it for ambari-agent non-root
functionality:${sudoers_dir}/ambari-agent:${sudoers_dir}/ambari-agent.bak"
echo "${backup_folders}" | while IFS=: read title notes source target; do
-if [ -d "${source}" ] || [ -f "${source}" ]; then
+if [ -e "${source}" ]; then
echo -n "Moving ${title}: ${source} -> ${target}"
if [ ! -z ${notes} ]; then
diff --git a/ambari-server/src/main/package/deb/control/preinst
b/ambari-server/src/main/package/deb/control/preinst
index 5b7841b..fc9bfe1 100644
--- a/ambari-server/src/main/package/deb/control/preinst
+++ b/ambari-server/src/main/package/deb/control/preinst
@@ -29,14 +29,14 @@ do_backups(){
# data format: "title:source:destination"; each new record on new line
local backup_folders="configs:${etc_dir}/conf.save:${etc_dir}/conf_$(date
'+%d_%m_%y_%H_%M').save
-Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.propertie.rpmsave
+Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.properties.rpmsave
Ambari properties:${var_dir}/ambari-env.sh:${var_dir}/ambari-env.sh.rpmsave
JAAS login
file:${etc_dir}/conf/krb5JAASLogin.conf:${etc_dir}/conf/krb5JAASLogin.conf.rpmsave
stacks directory:${var_dir}/resources/stacks:${stacks_backup_folder}
common-services
directory:${var_dir}/resources/common-services:${common_service_backup_folder}"
echo "${backup_folders}"| while IFS=: read title source destination; do
- if [ -d "${source}" ]; then
+ if [ -e "${source}" ]; then
echo "Backing up ${title}: ${source} -> ${destination}"
mv -f "${source}" "${destination}"
fi
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh
b/ambari-server/src/main/package/rpm/preinstall.sh
index 5b7841b..ad0909c 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -29,14 +29,14 @@ do_backups(){
# data format: "title:source:destination"; each new record on new line
local backup_folders="configs:${etc_dir}/conf.save:${etc_dir}/conf_$(date
'+%d_%m_%y_%H_%M').save
-Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.propertie.rpmsave
+Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.properties.rpmsave
Ambari properties:${var_dir}/ambari-env.sh:${var_dir}/ambari-env.sh.rpmsave
JAAS login
file:${etc_dir}/conf/krb5JAASLogin.conf:${etc_dir}/conf/krb5JAASLogin.conf.rpmsave
stacks directory:${var_dir}/resources/stacks:${stacks_backup_folder}
common-services
[ambari] branch trunk updated: AMBARI-24488. Ambari Server Upgrade is failing with IndexError: tuple index out of range while running ambari-server upgrade command. (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0daa5f1 AMBARI-24488. Ambari Server Upgrade is failing with
IndexError: tuple index out of range while running ambari-server upgrade
command. (aonishuk)
0daa5f1 is described below
commit 0daa5f1e30dca18835e877c5051a183d0bb3178e
Author: Andrew Onishuk
AuthorDate: Thu Aug 16 11:33:33 2018 +0300
AMBARI-24488. Ambari Server Upgrade is failing with IndexError: tuple index
out of range while running ambari-server upgrade command. (aonishuk)
---
ambari-agent/src/main/package/deb/control/preinst | 2 +-
ambari-agent/src/main/package/rpm/preinstall.sh| 2 +-
ambari-server/src/main/package/deb/control/preinst | 4 ++--
ambari-server/src/main/package/rpm/preinstall.sh | 6 +++---
ambari-server/src/main/python/ambari_server/serverConfiguration.py | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ambari-agent/src/main/package/deb/control/preinst
b/ambari-agent/src/main/package/deb/control/preinst
index ad6153f..7bbb73e 100644
--- a/ambari-agent/src/main/package/deb/control/preinst
+++ b/ambari-agent/src/main/package/deb/control/preinst
@@ -26,7 +26,7 @@ common services
folder::${var_dir}/cache/common-services:${var_dir}/cache/common
ambari-agent.ini::${etc_dir}/conf/ambari-agent.ini:${etc_dir}/conf/ambari-agent.ini.old
sudoers:Please restore the file if you were using it for ambari-agent non-root
functionality:${sudoers_dir}/ambari-agent:${sudoers_dir}/ambari-agent.bak"
- echo ${backup_folders} | while IFS=: read title notes source target; do
+ echo "${backup_folders}" | while IFS=: read title notes source target; do
if [ -d "${source}" ] || [ -f "${source}" ]; then
echo -n "Moving ${title}: ${source} -> ${target}"
if [ ! -z notes ]; then
diff --git a/ambari-agent/src/main/package/rpm/preinstall.sh
b/ambari-agent/src/main/package/rpm/preinstall.sh
index ff6dd3c..5454cdf 100644
--- a/ambari-agent/src/main/package/rpm/preinstall.sh
+++ b/ambari-agent/src/main/package/rpm/preinstall.sh
@@ -26,7 +26,7 @@
ambari-agent.ini::${etc_dir}/conf/ambari-agent.ini:${etc_dir}/conf/ambari-agent.
sudoers:Please restore the file if you were using it for ambari-agent non-root
functionality:${sudoers_dir}/ambari-agent:${sudoers_dir}/ambari-agent.bak"
echo "${backup_folders}" | while IFS=: read title notes source target; do
-if [ -d "${source}" ] || [ -f "${source}" ]; then
+if [ -e "${source}" ]; then
echo -n "Moving ${title}: ${source} -> ${target}"
if [ ! -z ${notes} ]; then
diff --git a/ambari-server/src/main/package/deb/control/preinst
b/ambari-server/src/main/package/deb/control/preinst
index 5b7841b..fc9bfe1 100644
--- a/ambari-server/src/main/package/deb/control/preinst
+++ b/ambari-server/src/main/package/deb/control/preinst
@@ -29,14 +29,14 @@ do_backups(){
# data format: "title:source:destination"; each new record on new line
local backup_folders="configs:${etc_dir}/conf.save:${etc_dir}/conf_$(date
'+%d_%m_%y_%H_%M').save
-Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.propertie.rpmsave
+Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.properties.rpmsave
Ambari properties:${var_dir}/ambari-env.sh:${var_dir}/ambari-env.sh.rpmsave
JAAS login
file:${etc_dir}/conf/krb5JAASLogin.conf:${etc_dir}/conf/krb5JAASLogin.conf.rpmsave
stacks directory:${var_dir}/resources/stacks:${stacks_backup_folder}
common-services
directory:${var_dir}/resources/common-services:${common_service_backup_folder}"
echo "${backup_folders}"| while IFS=: read title source destination; do
- if [ -d "${source}" ]; then
+ if [ -e "${source}" ]; then
echo "Backing up ${title}: ${source} -> ${destination}"
mv -f "${source}" "${destination}"
fi
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh
b/ambari-server/src/main/package/rpm/preinstall.sh
index 5b7841b..ad0909c 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -29,14 +29,14 @@ do_backups(){
# data format: "title:source:destination"; each new record on new line
local backup_folders="configs:${etc_dir}/conf.save:${etc_dir}/conf_$(date
'+%d_%m_%y_%H_%M').save
-Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.propertie.rpmsave
+Ambari
properties:${etc_dir}/conf/ambari.properties:${etc_dir}/conf/ambari.properties.rpmsave
Ambari properties:${var_dir}/ambari-env.sh:${var_dir}/ambari-env.sh.rpmsave
JAAS login
file:${etc_dir}/conf/krb5JAASLogin.conf:${etc_dir}/conf/krb5JAASLogin.conf.rpmsave
stacks directory:${var_dir}/resources/stacks:${stacks_backup_folder}
common-services
[ambari] branch branch-2.7 updated: AMBARI-24480. ADDENDUM: Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0) (#2082)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 10cb163 AMBARI-24480. ADDENDUM: Upgrade Infra Solr (from Solr 7.3.1
to Solr 7.4.0) (#2082)
10cb163 is described below
commit 10cb163d3dd4888a7f60a2653a7150e16e792cc4
Author: Oliver Szabo
AuthorDate: Thu Aug 16 12:10:42 2018 +0200
AMBARI-24480. ADDENDUM: Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0)
(#2082)
---
.../0.1.0/properties/solr-log4j.properties.j2 | 40 --
.../0.5.0/properties/audit_logs-solrconfig.xml.j2 | 2 +-
.../properties/service_logs-solrconfig.xml.j2 | 2 +-
3 files changed, 2 insertions(+), 42 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/solr-log4j.properties.j2
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/solr-log4j.properties.j2
deleted file mode 100644
index d81aa17..000
---
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/solr-log4j.properties.j2
+++ /dev/null
@@ -1,40 +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.
-
-# Logging level
-infra.solr.log.dir={{infra_solr_log_dir}}
-#log4j.rootLogger=INFO, file, CONSOLE
-log4j.rootLogger=WARN, file
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x
[%X{collection} %X{shard} %X{replica} %X{core}] \u2013 %m%n
-
-#- size rotation with log cleanup.
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.MaxFileSize={{infra_log_maxfilesize}}MB
-log4j.appender.file.MaxBackupIndex={{infra_log_maxbackupindex}}
-
-#- File to log to and log format
-log4j.appender.file.File=${infra.solr.log.dir}/solr.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ISO8601} [%t] %-5p
[%X{collection} %X{shard} %X{replica} %X{core}] %C (%F:%L) - %m%n
-
-log4j.logger.org.apache.zookeeper=WARN
-log4j.logger.org.apache.hadoop=WARN
-
-# set to INFO to enable infostream log messages
-log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
\ No newline at end of file
diff --git
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
index a0f73bf..f05e19c 100644
---
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
+++
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
@@ -35,7 +35,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml.
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- 7.3.1
+ 7.4.0
- 7.3.1
+ 7.4.0
[ambari] branch trunk updated: AMBARI-24486. Yarn Timeline Service V2 Reader is found down after EU (Atlantic to AtlanticM05) With error - Address already in use (amagyar) (#2085)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new a7cfe50 AMBARI-24486. Yarn Timeline Service V2 Reader is found down
after EU (Atlantic to AtlanticM05) With error - Address already in use
(amagyar) (#2085)
a7cfe50 is described below
commit a7cfe50429e2f359a51e4e1a37ccb95922413866
Author: Attila Magyar
AuthorDate: Thu Aug 16 11:58:30 2018 +0200
AMBARI-24486. Yarn Timeline Service V2 Reader is found down after EU
(Atlantic to AtlanticM05) With error - Address already in use (amagyar) (#2085)
---
.../upgrades/FixTimelineReaderAddress.java | 25 ++
.../upgrades/FixTimelineReaderAddressTest.java | 4 ++--
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
index c7ddaa8..e2f5613 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddress.java
@@ -49,9 +49,9 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
private static final Logger LOG =
LoggerFactory.getLogger(CreateAndConfigureAction.class);
private static final String YARN_SITE = "yarn-site";
private static final String TIMELINE_READER = "TIMELINE_READER";
- private static final String[] HOST_PROPERTIES = new String[] {
-"yarn.timeline-service.reader.webapp.address",
-"yarn.timeline-service.reader.webapp.https.address"
+ private static final String HTTP_ADDRESS =
"yarn.timeline-service.reader.webapp.address";
+ private static final String HTTPS_ADDRESS =
"yarn.timeline-service.reader.webapp.https.address";
+ private static final String[] HOST_PROPERTIES = new String[] {HTTP_ADDRESS,
HTTPS_ADDRESS
};
@Override
@@ -68,7 +68,7 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
if (oldHost == null) {
continue;
}
-String newHost = oldHost.replace("localhost", hostNameOf(cluster,
"YARN", TIMELINE_READER));
+String newHost = replace(oldHost, hostNameOf(cluster, "YARN",
TIMELINE_READER), defaultPort(propertyName));
updatedHosts.add(newHost);
updateConfig(cluster, propertyName, newHost, config);
}
@@ -78,6 +78,23 @@ public class FixTimelineReaderAddress extends
AbstractUpgradeServerAction {
}
}
+ private int defaultPort(String propertyName) {
+switch (propertyName) {
+ case HTTP_ADDRESS: return 8198;
+ case HTTPS_ADDRESS: return 8199;
+ default: throw new IllegalArgumentException("Unknown property: " +
propertyName);
+}
+ }
+
+ private String replace(String oldHost, String newHost, int defaultPort) {
+if (oldHost.contains(":")) {
+ String hostPart = oldHost.split(":")[0];
+ return oldHost.replace(hostPart, newHost);
+} else {
+ return newHost + ":" + defaultPort;
+}
+ }
+
private void updateConfig(Cluster cluster, String propertyName, String
propertyValue, Config config) throws AmbariException {
Map newProperties = new HashMap<>();
newProperties.put(propertyName, propertyValue);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
index 14bd0f7..eb0b68e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixTimelineReaderAddressTest.java
@@ -67,7 +67,7 @@ public class FixTimelineReaderAddressTest extends
EasyMockSupport {
expect(cluster.getDesiredConfigByType("yarn-site")).andReturn(config).anyTimes();
expect(config.getProperties()).andReturn(new HashMap() {{
put("yarn.timeline-service.reader.webapp.address", "localhost:8080");
- put("yarn.timeline-service.reader.webapp.https.address",
"localhost:8081");
+ put("yarn.timeline-service.reader.webapp.https.address",
"{{timeline_reader_address_https}}");
}}).anyTimes();
expect(yarn.getServiceComponent("TIMELINE_READER")).andReturn(timelineReader).anyTimes();
expect(timelineReader.getServiceComponentHosts()).andReturn(new
HashMap(){{
@@ -82,7 +82,7 @@ public class FixTimelineReaderAddressTest extends
EasyMockSupport {
}});
expectLastCall();
config.updateProperties(new HashMap() {{
- put("yarn.timeline-service.reader.webapp.https.address", "newhost:8081");
[ambari] branch trunk updated: AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0 (#2088)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 49e8ee3 AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr
7.4.0 (#2088)
49e8ee3 is described below
commit 49e8ee3b82a4133aa5e3b4647c423200c8df1b20
Author: Olivér Szabó
AuthorDate: Thu Aug 16 11:58:07 2018 +0200
AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0 (#2088)
---
.../ambari-infra-manager/docker/docker-compose.yml | 2 +-
.../docker/infra-manager-docker-compose.sh | 2 +-
ambari-infra/ambari-infra-solr-client/README.md| 8 +-
.../src/main/python/migrationHelper.py | 2 +-
.../src/main/resources/solrIndexHelper.sh | 8 +-
.../docker/infra-solr-docker-compose.sh| 2 +-
ambari-infra/pom.xml | 2 +-
.../main/configsets/audit_logs/conf/solrconfig.xml | 2 +-
.../configsets/hadoop_logs/conf/solrconfig.xml | 2 +-
.../main/configsets/history/conf/solrconfig.xml| 2 +-
ambari-logsearch/docker/Dockerfile | 2 +-
ambari-logsearch/docker/docker-compose.yml | 2 +-
ambari-logsearch/docker/logsearch-docker.sh| 2 +-
ambari-logsearch/docker/solr.yml | 2 +-
ambari-logsearch/docker/sso.yml| 2 +-
ambari-logsearch/pom.xml | 2 +-
.../ambari/server/upgrade/UpgradeCatalog271.java | 99 ++
.../server/upgrade/UpgradeCatalog271Test.java | 64 ++
18 files changed, 185 insertions(+), 22 deletions(-)
diff --git a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
index d77205f..2369d85 100644
--- a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
+++ b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
# TODO: use infra-solr
-image: solr:${SOLR_VERSION:-7.3.1}
+image: solr:${SOLR_VERSION:-7.4.0}
restart: always
hostname: solr
ports:
diff --git
a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
index c36d671..5271909 100755
--- a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
+++ b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
@@ -72,7 +72,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.3.1
+SOLR_VERSION=7.4.0
HADOOP_VERSION=3.0.0
EOF
diff --git a/ambari-infra/ambari-infra-solr-client/README.md
b/ambari-infra/ambari-infra-solr-client/README.md
index a14f92a..2b6d004 100644
--- a/ambari-infra/ambari-infra-solr-client/README.md
+++ b/ambari-infra/ambari-infra-solr-client/README.md
@@ -472,7 +472,7 @@ If the script finished successfully and everything looks
green on Ambari UI as w
Migration for `ranger_audits` collection (cores):
```bash
-# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.3.1 flag
+# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.4.0 flag
/usr/lib/ambari-infra-solr-client/migrationHelper.py --ini-file
$CONFIG_INI_LOCATION --action migrate -s RANGER
```
@@ -487,7 +487,7 @@ infra-lucene-index-tool upgrade-index -d /tmp/ranger-backup
-f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.3.1` option.
+By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.4.0` option.
VI/2. Migrate Atlas collections
@@ -509,7 +509,7 @@ infra-lucene-index-tool upgrade-index -d
/tmp/fulltext_index_backup -f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.3.1` option.
+By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.4.0` option.
### VII. Restore Collections
@@ -852,7 +852,7 @@ Options:
location of the index
[ambari] branch branch-2.7 updated: AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0) (#2082)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 4482cdc AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr
7.4.0) (#2082)
4482cdc is described below
commit 4482cdcacc935632a1a8266923c01a2795203755
Author: Olivér Szabó
AuthorDate: Thu Aug 16 11:14:57 2018 +0200
AMBARI-24480. Upgrade Infra Solr (from Solr 7.3.1 to Solr 7.4.0) (#2082)
* AMBARI-24480. Upload Infra Solr (from Solr 7.3.1 to Solr 7.4.0)
* AMBARI-24480. Fix naming
---
.../ambari-infra-manager/docker/docker-compose.yml | 2 +-
.../docker/infra-manager-docker-compose.sh | 2 +-
ambari-infra/ambari-infra-solr-client/README.md| 8 +-
.../src/main/python/migrationHelper.py | 2 +-
.../src/main/resources/solrIndexHelper.sh | 8 +-
.../docker/infra-solr-docker-compose.sh| 2 +-
ambari-infra/pom.xml | 2 +-
.../main/configsets/audit_logs/conf/solrconfig.xml | 2 +-
.../configsets/hadoop_logs/conf/solrconfig.xml | 2 +-
.../main/configsets/history/conf/solrconfig.xml| 2 +-
ambari-logsearch/docker/Dockerfile | 2 +-
ambari-logsearch/docker/docker-compose.yml | 2 +-
ambari-logsearch/docker/logsearch-docker.sh| 2 +-
ambari-logsearch/docker/solr.yml | 2 +-
ambari-logsearch/docker/sso.yml| 2 +-
ambari-logsearch/pom.xml | 2 +-
.../ambari/server/upgrade/UpgradeCatalog271.java | 99 ++
.../0.1.0/configuration/infra-solr-log4j.xml | 4 +-
.../0.1.0/package/scripts/setup_infra_solr.py | 2 +-
.../0.1.0/properties/infra-solr-env.sh.j2 | 2 +-
.../0.1.0/properties/solr-log4j2.xml.j2| 74
.../server/upgrade/UpgradeCatalog271Test.java | 64 ++
22 files changed, 263 insertions(+), 26 deletions(-)
diff --git a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
index d77205f..2369d85 100644
--- a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
+++ b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
# TODO: use infra-solr
-image: solr:${SOLR_VERSION:-7.3.1}
+image: solr:${SOLR_VERSION:-7.4.0}
restart: always
hostname: solr
ports:
diff --git
a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
index c36d671..5271909 100755
--- a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
+++ b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
@@ -72,7 +72,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.3.1
+SOLR_VERSION=7.4.0
HADOOP_VERSION=3.0.0
EOF
diff --git a/ambari-infra/ambari-infra-solr-client/README.md
b/ambari-infra/ambari-infra-solr-client/README.md
index a14f92a..2b6d004 100644
--- a/ambari-infra/ambari-infra-solr-client/README.md
+++ b/ambari-infra/ambari-infra-solr-client/README.md
@@ -472,7 +472,7 @@ If the script finished successfully and everything looks
green on Ambari UI as w
Migration for `ranger_audits` collection (cores):
```bash
-# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.3.1 flag
+# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.4.0 flag
/usr/lib/ambari-infra-solr-client/migrationHelper.py --ini-file
$CONFIG_INI_LOCATION --action migrate -s RANGER
```
@@ -487,7 +487,7 @@ infra-lucene-index-tool upgrade-index -d /tmp/ranger-backup
-f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.3.1` option.
+By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.4.0` option.
VI/2. Migrate Atlas collections
@@ -509,7 +509,7 @@ infra-lucene-index-tool upgrade-index -d
/tmp/fulltext_index_backup -f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
[ambari] branch branch-2.7 updated: AMBARI-24484. HDP-GPL repo's shouldn't be pushed to hosts when GPL license was not applied. (#2083)
This is an automated email from the ASF dual-hosted git repository.
mpapirkovskyy pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 7c02075 AMBARI-24484. HDP-GPL repo's shouldn't be pushed to hosts
when GPL license was not applied. (#2083)
7c02075 is described below
commit 7c02075b3b18edfefa4f5a3d4ab1cd7f08edf766
Author: Myroslav Papirkovskyi
AuthorDate: Thu Aug 16 11:59:22 2018 +0300
AMBARI-24484. HDP-GPL repo's shouldn't be pushed to hosts when GPL license
was not applied. (#2083)
* AMBARI-24484. HDP-GPL repo's shouldn't be pushed to hosts when GPL
license was not applied. (mpapirkovskyy)
* AMBARI-24484. HDP-GPL repo's shouldn't be pushed to hosts when GPL
license was not applied. (mpapirkovskyy)
---
.../main/python/resource_management/libraries/script/script.py | 9 +
.../java/org/apache/ambari/server/agent/CommandRepository.java | 1 +
2 files changed, 10 insertions(+)
diff --git
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 52287a4..e630f6e 100644
---
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -781,6 +781,15 @@ class Script(object):
service_name = config['serviceName'] if 'serviceName' in config else None
repos = CommandRepository(config['repositoryFile'])
+
+from resource_management.libraries.functions import lzo_utils
+
+# remove repos with 'GPL' tag when GPL license is not approved
+repo_tags_to_skip = set()
+if not lzo_utils.is_gpl_license_accepted():
+ repo_tags_to_skip.add("GPL")
+repos.items = [r for r in repos.items if not (repo_tags_to_skip & r.tags)]
+
repo_ids = [repo.repo_id for repo in repos.items]
Logger.info("Command repositories: {0}".format(", ".join(repo_ids)))
repos.items = [x for x in repos.items if (not x.applicable_services or
service_name in x.applicable_services) ]
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
index 00c837a..2671241 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
@@ -272,6 +272,7 @@ public class CommandRepository {
private List m_applicableServices;
@SerializedName("tags")
+@JsonProperty("tags")
private Set m_tags;
