[1/2] ambari git commit: AMBARI-9188. Adhere to ambari's 2-space formatting rule. AMBARI-9285. Add default values for ranger plugin properties. AMBARI-9286. Stack advisor recommendations. (Gautam Bora
Repository: ambari
Updated Branches:
refs/heads/trunk 46b23d40b - 4cbf3a876
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cbf3a87/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
index 28fabe5..9acf8f8 100644
---
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
@@ -148,14 +148,26 @@ if security_enabled:
# ranger host
ranger_admin_hosts = default(/clusterHostInfo/ranger_admin_hosts, [])
+user_input =
default(/configurations/ranger-knox-plugin-properties/ranger-knox-plugin-enabled,
no)
has_ranger_admin = not len(ranger_admin_hosts) == 0
if hdp_stack_version != and compare_versions(hdp_stack_version, '2.2') = 0:
-# Setting Flag value for ranger hbase plugin
+ # Setting Flag value for ranger hbase plugin
+ enable_ranger_knox = False
+ user_input =
config['configurations']['ranger-knox-plugin-properties']['ranger-knox-plugin-enabled']
+ if user_input.lower() == 'yes':
+enable_ranger_knox = True
+ elif user_input.lower() == 'no':
enable_ranger_knox = False
-user_input =
config['configurations']['ranger-knox-plugin-properties']['ranger-knox-plugin-enabled']
-if user_input.lower() == 'yes':
- enable_ranger_knox = True
-elif user_input.lower() == 'no':
- enable_ranger_knox = False
+
+ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
+
+jdk_location = config['hostLevelParams']['jdk_location']
+java_share_dir = '/usr/share/java'
+jdbc_jar_name = mysql-connector-java.jar
+
+downloaded_custom_connector = format({tmp_dir}/{jdbc_jar_name})
+
+driver_curl_source = format({jdk_location}/{jdbc_jar_name})
+driver_curl_target = format({java_share_dir}/{jdbc_jar_name})
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cbf3a87/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
index 76185a8..847f2dd 100644
---
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
+++
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
@@ -8,7 +8,7 @@ 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
+ 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,
@@ -22,162 +22,184 @@ import fileinput
import subprocess
import json
import re
+import os
from resource_management import *
from resource_management.libraries.functions.ranger_functions import
Rangeradmin
from resource_management.core.logger import Logger
def setup_ranger_knox(env):
-import params
-env.set_params(params)
-
-if params.has_ranger_admin:
-try:
-command = 'hdp-select status knox-server'
-return_code, hdp_output = shell.call(command, timeout=20)
-except Exception, e:
-Logger.error(str(e))
-raise Fail('Unable to execute hdp-select command to retrieve the
version.')
-
-if return_code != 0:
-raise Fail('Unable to determine the current version because of a
non-zero return code of {0}'.format(str(return_code)))
-
-hdp_version = re.sub('knox-server - ', '', hdp_output)
-match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', hdp_version)
-
-if match is None:
-raise Fail('Failed to get extracted version')
-
-file_path = '/usr/hdp/'+ hdp_version
+'/ranger-knox-plugin/install.properties'
-
-ranger_knox_dict = ranger_knox_properties(params)
-knox_repo_data = knox_repo_properties(params)
-
-write_properties_to_file(file_path, ranger_knox_dict)
-
-if params.enable_ranger_knox:
-cmd = format('cd /usr/hdp/{hdp_version}/ranger-knox-plugin/ sh
enable-knox-plugin.sh')
-ranger_adm_obj =
Rangeradmin(url=ranger_knox_dict['POLICY_MGR_URL'])
-response_code, response_recieved =
ranger_adm_obj.check_ranger_login_urllib2(ranger_knox_dict['POLICY_MGR_URL'] +
'/login.jsp', 'test:test')
ambari git commit: AMBARI-9341 Failing to register hosts on Centos5
Repository: ambari
Updated Branches:
refs/heads/trunk 4cbf3a876 - f27c22b0c
AMBARI-9341 Failing to register hosts on Centos5
+Fixed the ambari_commons imports to only include the bare minimum required to
function
+Fixed the incompartibilities with Python 2.4
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f27c22b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f27c22b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f27c22b0
Branch: refs/heads/trunk
Commit: f27c22b0c57c1b48ba372abb0c0fa6b74f6eda0e
Parents: 4cbf3a8
Author: Florian Barca fba...@hortonworks.com
Authored: Tue Jan 27 15:17:23 2015 -0800
Committer: Florian Barca fba...@hortonworks.com
Committed: Tue Jan 27 15:17:23 2015 -0800
--
.../src/main/python/ambari_agent/HostInfo.py| 22 +++-
.../test/python/ambari_agent/TestHostInfo.py| 4 ++--
.../python/ambari_agent/TestRegistration.py | 2 +-
.../src/main/python/ambari_commons/__init__.py | 5 +
.../libraries/functions/packages_analyzer.py| 4 ++--
ambari-server/src/main/python/bootstrap.py | 15 +++--
ambari-server/src/main/python/setupAgent.py | 10 +++--
.../src/test/python/TestAmbariServer.py | 3 ++-
8 files changed, 30 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f27c22b0/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 7a1dbb7..2c707b2 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -18,23 +18,25 @@ See the License for the specific language governing
permissions and
limitations under the License.
'''
-import os
import glob
+import hostname
import logging
+import os
import re
-import time
-import subprocess
-import threading
import shlex
-import platform
-import hostname
-from HostCheckReportFileHandler import HostCheckReportFileHandler
-from Hardware import Hardware
-from ambari_commons import OSCheck, OSConst, Firewall
-from resource_management.libraries.functions import packages_analyzer
import socket
+import subprocess
+import time
+
+from ambari_commons import OSCheck, OSConst
+from ambari_commons.firewall import Firewall
from ambari_commons.os_family_impl import OsFamilyImpl
+from resource_management.libraries.functions import packages_analyzer
+from ambari_agent.Hardware import Hardware
+from ambari_agent.HostCheckReportFileHandler import HostCheckReportFileHandler
+
+
logger = logging.getLogger()
# service cmd
http://git-wip-us.apache.org/repos/asf/ambari/blob/f27c22b0/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index adeb798..c1b93d6 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -39,14 +39,14 @@ else:
os_distro_value = ('win2012serverr2','6.3','WindowsServer')
with patch.object(OSCheck, os_distribution, new = MagicMock(return_value =
os_distro_value)):
+ from ambari_commons.firewall import Firewall
+ from ambari_commons.os_check import OSCheck, OSConst
from ambari_agent.HostCheckReportFileHandler import
HostCheckReportFileHandler
from ambari_agent.HostInfo import HostInfo, HostInfoLinux
from ambari_agent.Hardware import Hardware
from ambari_agent.AmbariConfig import AmbariConfig
from resource_management.core.system import System
- from ambari_commons import OSCheck, Firewall, FirewallChecks, OSConst
from resource_management.libraries.functions import packages_analyzer
- import ambari_commons
@patch.object(OSCheck, os_distribution, new = MagicMock(return_value =
os_distro_value))
class TestHostInfo(TestCase):
http://git-wip-us.apache.org/repos/asf/ambari/blob/f27c22b0/ambari-agent/src/test/python/ambari_agent/TestRegistration.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestRegistration.py
b/ambari-agent/src/test/python/ambari_agent/TestRegistration.py
index 92e4b36..b7a7f89 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestRegistration.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestRegistration.py
@@ -26,9 +26,9 @@ from mock.mock import MagicMock
from only_for_platform import not_for_platform, PLATFORM_WINDOWS
with patch(platform.linux_distribution, return_value =
('Suse','11','Final')):
+ from
ambari git commit: AMBARI-9340. RU - Cluster install did not transition cluster_version to CURRENT because host has only AMS (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 5c1537bab - c242beeac
AMBARI-9340. RU - Cluster install did not transition cluster_version to CURRENT
because host has only AMS (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c242beea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c242beea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c242beea
Branch: refs/heads/trunk
Commit: c242beeac73c071da2502ab8f1884ea723fafa2a
Parents: 5c1537b
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Mon Jan 26 15:52:47 2015 -0800
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Tue Jan 27 15:49:06 2015 -0800
--
.../ambari/server/agent/HeartBeatHandler.java | 9 +-
.../StackServiceComponentResponse.java | 14 +-
.../StackServiceComponentResourceProvider.java | 2 +-
.../ambari/server/events/AmbariEvent.java | 6 +-
.../events/HostComponentVersionEvent.java | 65 ++
.../listeners/upgrade/StackVersionListener.java | 89 +
.../ambari/server/stack/ComponentModule.java| 2 +-
.../org/apache/ambari/server/state/Cluster.java | 18 ++-
.../ambari/server/state/ComponentInfo.java | 17 +--
.../server/state/cluster/ClusterImpl.java | 129 +--
.../svccomphost/ServiceComponentHostImpl.java | 109
.../common-services/AMS/0.1.0/metainfo.xml | 4 +-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../HIVE/0.12.0.2.0/metainfo.xml| 2 +-
.../KERBEROS/1.10.3-10/metainfo.xml | 2 +-
15 files changed, 351 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c242beea/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 092f9d5..80ef542 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -47,6 +47,7 @@ import
org.apache.ambari.server.controller.MaintenanceStateHelper;
import org.apache.ambari.server.events.ActionFinalReportReceivedEvent;
import org.apache.ambari.server.events.AlertEvent;
import org.apache.ambari.server.events.AlertReceivedEvent;
+import org.apache.ambari.server.events.HostComponentVersionEvent;
import org.apache.ambari.server.events.publishers.AlertEventPublisher;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.metadata.ActionMetadata;
@@ -481,13 +482,15 @@ public class HeartBeatHandler {
final String previousVersion = scHost.getVersion();
if (!StringUtils.equals(previousVersion,
structuredOutput.getVersion())) {
scHost.setVersion(structuredOutput.getVersion());
- if (previousVersion != null
!previousVersion.equals(UNKNOWN)) {
+ if (previousVersion != null
!previousVersion.equalsIgnoreCase(State.UNKNOWN.toString())) {
scHost.setUpgradeState(UpgradeState.COMPLETE);
}
- String repoVersion = scHost.recalculateHostVersionState();
- cl.recalculateClusterVersionState(repoVersion);
}
}
+ // Safer to recalculate the version even if we don't detect a
difference in the value.
+ // This is useful in case that a manual database edit is done
while ambari-server is stopped.
+ HostComponentVersionEvent event = new
HostComponentVersionEvent(cl, scHost);
+ ambariEventPublisher.publish(event);
}
// Updating stack version, if needed
http://git-wip-us.apache.org/repos/asf/ambari/blob/c242beea/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java
index 7924ba8..d15d618 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java
@@ -78,7 +78,7 @@ public class StackServiceComponentResponse {
/**
* does the component need to advertise a
[1/2] ambari git commit: AMBARI-9364. Handle hosts/services/components being added to a kerberized cluster.
Repository: ambari
Updated Branches:
refs/heads/trunk c242beeac - 5e930e44c
AMBARI-9364. Handle hosts/services/components being added to a kerberized
cluster.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1dd3ad21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1dd3ad21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1dd3ad21
Branch: refs/heads/trunk
Commit: 1dd3ad2178dc1b1a11511ce163a64aa78d3dfdd7
Parents: c242bee
Author: John Speidel jspei...@hortonworks.com
Authored: Tue Jan 27 18:44:59 2015 -0500
Committer: John Speidel jspei...@hortonworks.com
Committed: Tue Jan 27 19:37:16 2015 -0500
--
.../server/controller/KerberosHelper.java | 115 -
.../internal/HostComponentResourceProvider.java | 47 +-
.../server/controller/KerberosHelperTest.java | 169 +--
.../HostComponentResourceProviderTest.java | 129 +-
4 files changed, 436 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1dd3ad21/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index c537498..6bb9bf1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -29,8 +29,21 @@ import org.apache.ambari.server.actionmanager.Stage;
import org.apache.ambari.server.actionmanager.StageFactory;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.internal.ArtifactResourceProvider;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.internal.RequestResourceFilter;
import org.apache.ambari.server.controller.internal.RequestStageContainer;
+import org.apache.ambari.server.controller.spi.ClusterController;
+import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
+import org.apache.ambari.server.controller.spi.NoSuchResourceException;
+import org.apache.ambari.server.controller.spi.Predicate;
+import org.apache.ambari.server.controller.spi.Request;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
+import org.apache.ambari.server.controller.spi.SystemException;
+import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.metadata.RoleCommandOrder;
import org.apache.ambari.server.serveraction.ServerAction;
import org.apache.ambari.server.serveraction.kerberos.*;
@@ -64,6 +77,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -76,6 +90,16 @@ public class KerberosHelper {
private static final Logger LOG =
LoggerFactory.getLogger(KerberosHelper.class);
+ /**
+ * config type which contains the property used to determine if keberos is
enabled
+ */
+ private static final String SECURITY_ENABLED_CONFIG_TYPE = cluster-env;
+
+ /**
+ * name of property which states whether kerberos is enabled
+ */
+ private static final String SECURITY_ENABLED_PROPERTY_NAME =
security_enabled;
+
@Inject
private AmbariCustomCommandExecutionHelper customCommandExecutionHelper;
@@ -107,6 +131,12 @@ public class KerberosHelper {
private KerberosOperationHandlerFactory kerberosOperationHandlerFactory;
/**
+ * Used to get kerberos descriptors associated with the cluster or stack.
+ * Currently not available via injection.
+ */
+ private static ClusterController clusterController = null;
+
+ /**
* The Handler implementation that provides the logic to enable Kerberos
*/
private Handler enableKerberosHandler = new EnableKerberosHandler();
@@ -159,6 +189,11 @@ public class KerberosHelper {
// Update KerberosDetails with the new security type - the current one in
the cluster is the old value
kerberosDetails.setSecurityType(securityType);
+//todo: modify call from cluster state transition to not include descriptor
+if (kerberosDescriptor == null) {
+ kerberosDescriptor = getClusterDescriptor(cluster);
+}
+
if (securityType ==
[2/2] ambari git commit: AMBARI-9366. Fix create statement for artifact table in external Postgres DB script
AMBARI-9366. Fix create statement for artifact table in external Postgres DB script Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e930e44 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e930e44 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e930e44 Branch: refs/heads/trunk Commit: 5e930e44c8412cab73554a8ab17c13b32f5bb630 Parents: 1dd3ad2 Author: John Speidel jspei...@hortonworks.com Authored: Tue Jan 27 19:49:27 2015 -0500 Committer: John Speidel jspei...@hortonworks.com Committed: Tue Jan 27 19:49:27 2015 -0500 -- ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5e930e44/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql -- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql index 64ffc4f..b589993 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -509,7 +509,7 @@ CREATE TABLE repo_version ( PRIMARY KEY(repo_version_id) ); -CREATE TABLE ambari.artifact ( +CREATE TABLE artifact ( artifact_name VARCHAR(255) NOT NULL, artifact_data TEXT NOT NULL, foreign_keys VARCHAR(255) NOT NULL,
