ambari git commit: AMBARI-10818. Hit re-install when performing an RU - UI seems to have stuck at installing even though the request has completed (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 807b3c2df -> ac1ba0e4f
AMBARI-10818. Hit re-install when performing an RU - UI seems to have stuck at
installing even though the request has completed (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac1ba0e4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac1ba0e4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac1ba0e4
Branch: refs/heads/trunk
Commit: ac1ba0e4f2595e4dc109f3aa5a0ae06f47f4c012
Parents: 807b3c2
Author: Lisnichenko Dmitro
Authored: Thu May 7 08:44:32 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Thu May 7 08:44:32 2015 +0300
--
.../DistributeRepositoriesActionListener.java | 163 ++-
.../server/agent/TestHeartbeatHandler.java | 3 +
2 files changed, 89 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac1ba0e4/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
index 5600ef1..21e3a48 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.events.listeners.upgrade;
import java.util.List;
+import com.google.inject.persist.UnitOfWork;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
@@ -67,6 +68,9 @@ public class DistributeRepositoriesActionListener {
@Inject
private RepositoryVersionDAO repoVersionDAO;
+ @Inject
+ private UnitOfWork unitOfWork;
+
/**
* Constructor.
@@ -85,96 +89,101 @@ public class DistributeRepositoriesActionListener {
return;
}
-if (LOG.isDebugEnabled()) {
- LOG.debug(event.toString());
-}
+try {
+ unitOfWork.begin();
+ if (LOG.isDebugEnabled()) {
+LOG.debug(event.toString());
+ }
-RepositoryVersionState newHostState =
RepositoryVersionState.INSTALL_FAILED;
-Long clusterId = event.getClusterId();
-if (clusterId == null) {
- LOG.error("Distribute Repositories expected a cluster Id for host " +
event.getHostname());
- return;
-}
+ RepositoryVersionState newHostState =
RepositoryVersionState.INSTALL_FAILED;
+ Long clusterId = event.getClusterId();
+ if (clusterId == null) {
+LOG.error("Distribute Repositories expected a cluster Id for host " +
event.getHostname());
+return;
+ }
+
+ String repositoryVersion = null;
+
+ if (event.getCommandReport() == null) {
+LOG.error("Command report is null, marking action as INSTALL_FAILED");
+ } else {
+// Parse structured output
+try {
+ DistributeRepositoriesStructuredOutput structuredOutput =
StageUtils.getGson().fromJson(
+ event.getCommandReport().getStructuredOut(),
+ DistributeRepositoriesStructuredOutput.class);
-String repositoryVersion = null;
-
-if (event.getCommandReport() == null) {
- LOG.error("Command report is null, marking action as INSTALL_FAILED");
-} else {
- // Parse structured output
- try {
-DistributeRepositoriesStructuredOutput structuredOutput =
StageUtils.getGson().fromJson(
-event.getCommandReport().getStructuredOut(),
-DistributeRepositoriesStructuredOutput.class);
-
-repositoryVersion = structuredOutput.getInstalledRepositoryVersion();
-
-if
(event.getCommandReport().getStatus().equals(HostRoleStatus.COMPLETED.toString()))
{
- newHostState = RepositoryVersionState.INSTALLED;
-
- if (null != structuredOutput.getActualVersion() &&
- null != structuredOutput.getInstalledRepositoryVersion() &&
- null != structuredOutput.getStackId() &&
-
!structuredOutput.getActualVersion().equals(structuredOutput.getInstalledRepositoryVersion()))
{
-
-// !!! getInstalledRepositoryVersion() from the agent is the one
-// entered in the UI. getActualVersion() is computed.
-
-StackId stackId = new StackId(structuredOutput.getStackId());
-RepositoryVersionEntity version =
repoVersionDAO.findByStackAn
[3/4] ambari git commit: AMBARI-10990. Implement topology manager persistence
http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
index 9f9db5c..9e25dfb 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
@@ -18,144 +18,122 @@
package org.apache.ambari.server.topology;
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.Role;
-import org.apache.ambari.server.RoleCommand;
-import org.apache.ambari.server.actionmanager.ActionManager;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
-import org.apache.ambari.server.actionmanager.HostRoleCommandFactory;
-import org.apache.ambari.server.actionmanager.HostRoleStatus;
-import org.apache.ambari.server.api.services.AmbariMetaInfo;
-import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.controller.ConfigGroupRequest;
+import org.apache.ambari.server.api.predicate.InvalidQueryException;
+import org.apache.ambari.server.api.predicate.PredicateCompiler;
import org.apache.ambari.server.controller.RequestStatusResponse;
-import org.apache.ambari.server.controller.ServiceComponentHostRequest;
import org.apache.ambari.server.controller.ShortTaskStatus;
-import
org.apache.ambari.server.controller.internal.ConfigGroupResourceProvider;
-import
org.apache.ambari.server.controller.internal.HostComponentResourceProvider;
import org.apache.ambari.server.controller.internal.HostResourceProvider;
-import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.internal.ResourceImpl;
import org.apache.ambari.server.controller.internal.Stack;
-import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
-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.orm.entities.HostRoleCommandEntity;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Config;
-import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.ambari.server.state.ConfigImpl;
-import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.configgroup.ConfigGroup;
+import org.apache.ambari.server.orm.entities.TopologyHostRequestEntity;
+import org.apache.ambari.server.orm.entities.TopologyHostTaskEntity;
+import org.apache.ambari.server.orm.entities.TopologyLogicalTaskEntity;
import org.apache.ambari.server.state.host.HostImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-
-import static org.apache.ambari.server.controller.AmbariServer.getController;
/**
* Represents a set of requests to a single host such as install, start, etc.
*/
public class HostRequest implements Comparable {
+ private final static Logger LOG = LoggerFactory.getLogger(HostRequest.class);
+
private long requestId;
private String blueprint;
private HostGroup hostGroup;
private String hostgroupName;
private Predicate predicate;
- private int cardinality = -1;
private String hostname = null;
private String cluster;
private boolean containsMaster;
- private long stageId = -1;
- //todo: should be able to use the presence of hostName for this
- private boolean outstanding = true;
+ private final long id;
+ private boolean isOutstanding = true;
- //todo: remove
- private Map logicalInstallTaskIds = new HashMap();
- //todo: remove
- private Map logicalStartTaskIds = new HashMap();
+ private Map> logicalTaskMap = new
HashMap>();
- Collection logicalTasks = new ArrayList();
+ Map logicalTasks = new HashMap();
// logical task id -> physical tasks
- private Map> physicalTasks = new HashMap>();
-
- private static HostResourceProvider hostResourceProvider;
-
- private HostComponentResourceProvider hostComponentResourceProvider;
+ private Map physicalTasks = new HashMap();
- private AmbariManagementController controller = getController();
- private ActionManager actionManager = controller.getActionManager();
- private Confi
[2/4] ambari git commit: AMBARI-10990. Implement topology manager persistence
http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index fb4baec..5ea175f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -10,8 +10,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distribut
- * ed on an "AS IS" BASIS,
+ * 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.
@@ -23,21 +22,10 @@ import com.google.inject.Singleton;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
import org.apache.ambari.server.actionmanager.Request;
-import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.controller.AmbariServer;
-import org.apache.ambari.server.controller.ClusterRequest;
import org.apache.ambari.server.controller.RequestStatusResponse;
-import org.apache.ambari.server.controller.ServiceComponentRequest;
-import org.apache.ambari.server.controller.ServiceRequest;
-import org.apache.ambari.server.controller.internal.ComponentResourceProvider;
-import org.apache.ambari.server.controller.internal.ServiceResourceProvider;
import org.apache.ambari.server.controller.internal.Stack;
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
import org.apache.ambari.server.orm.dao.HostRoleCommandStatusSummaryDTO;
import org.apache.ambari.server.orm.entities.StageEntity;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.SecurityType;
import org.apache.ambari.server.state.host.HostImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,12 +39,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.Executors;
/**
* Manages all cluster provisioning actions on the cluster topology.
@@ -65,77 +49,85 @@ import java.util.concurrent.atomic.AtomicLong;
@Singleton
public class TopologyManager {
+ public static final String INITIAL_CONFIG_TAG = "INITIAL";
+ public static final String TOPOLOGY_RESOLVED_TAG = "TOPOLOGY_RESOLVED";
+
+ private PersistedState persistedState;
+ //private ExecutorService executor = getExecutorService();
+ private ExecutorService executor = Executors.newSingleThreadExecutor();
+ private Collection hostsToIgnore = new HashSet();
private final List availableHosts = new LinkedList();
private final Map reservedHosts = new
HashMap();
private final Map allRequests = new HashMap();
// priority is given to oldest outstanding requests
private final Collection outstandingRequests = new
ArrayList();
+ //todo: currently only support a single cluster
private Map clusterTopologyMap = new
HashMap();
- private final Map> pendingTasks = new
HashMap>();
-
- //todo: proper wait/notify mechanism
- private final Object configurationFlagLock = new Object();
- private boolean configureComplete = false;
+ //private final Map> pendingTasks = new
HashMap>();
- private AmbariManagementController controller;
- ExecutorService executor;
- //todo: task id's. Use existing mechanism for getting next task id sequence
- private final static AtomicLong nextTaskId = new AtomicLong(1);
- private final Object serviceResourceLock = new Object();
+ //todo: inject
+ private static LogicalRequestFactory logicalRequestFactory = new
LogicalRequestFactory();
+ private static AmbariContext ambariContext = new AmbariContext();
- protected final static Logger LOG =
LoggerFactory.getLogger(TopologyManager.class);
+ private final Object initializationLock = new Object();
+ private boolean isInitialized;
+ private final static Logger LOG =
LoggerFactory.getLogger(TopologyManager.class);
public TopologyManager() {
-pendingTasks.put(TopologyTask.Type.CONFIGURE, new HashSet());
-pendingTasks.put(TopologyTask.Type.INSTALL, new HashSet());
-pendingTasks.put(TopologyTask.Type.START, new HashSet());
+pe
[4/4] ambari git commit: AMBARI-10990. Implement topology manager persistence
AMBARI-10990. Implement topology manager persistence Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/807b3c2d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/807b3c2d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/807b3c2d Branch: refs/heads/trunk Commit: 807b3c2df7a9a9fe1d728e75cf80c130848d4756 Parents: 8963501 Author: John Speidel Authored: Thu May 7 01:17:10 2015 -0400 Committer: John Speidel Committed: Thu May 7 01:17:10 2015 -0400 -- .../query/render/ClusterBlueprintRenderer.java | 4 +- .../ambari/server/controller/AmbariServer.java | 4 +- .../server/controller/ControllerModule.java | 2 - .../internal/ExportBlueprintRequest.java| 10 + .../internal/HostComponentResourceProvider.java | 34 +- .../internal/HostResourceProvider.java | 4 +- .../internal/ProvisionClusterRequest.java | 14 +- .../internal/ScaleClusterRequest.java | 94 ++- .../server/controller/internal/Stack.java | 30 +- .../server/orm/dao/TopologyHostGroupDAO.java| 12 + .../server/orm/dao/TopologyHostTaskDAO.java | 73 ++ .../server/orm/dao/TopologyLogicalTaskDAO.java | 63 ++ .../server/orm/entities/BlueprintEntity.java| 3 - .../orm/entities/TopologyHostGroupEntity.java | 28 +- .../orm/entities/TopologyHostInfoEntity.java| 6 +- .../orm/entities/TopologyHostRequestEntity.java | 11 +- .../orm/entities/TopologyHostTaskEntity.java| 6 + .../entities/TopologyLogicalRequestEntity.java | 4 - .../ambari/server/topology/AmbariContext.java | 499 + .../ambari/server/topology/BlueprintImpl.java | 3 +- .../topology/ClusterConfigurationRequest.java | 30 +- .../ambari/server/topology/ClusterTopology.java | 30 + .../server/topology/ClusterTopologyImpl.java| 33 +- .../ambari/server/topology/HostGroupInfo.java | 15 +- .../server/topology/HostOfferResponse.java | 9 +- .../ambari/server/topology/HostRequest.java | 699 +++ .../ambari/server/topology/LogicalRequest.java | 153 ++-- .../server/topology/LogicalRequestFactory.java | 40 ++ .../ambari/server/topology/PersistedState.java | 69 ++ .../server/topology/PersistedStateImpl.java | 408 +++ .../topology/PersistedTopologyRequest.java | 41 ++ .../ambari/server/topology/TopologyManager.java | 379 -- .../ambari/server/topology/TopologyRequest.java | 4 + .../ambari/server/topology/TopologyTask.java| 5 + .../server/upgrade/UpgradeCatalog210.java | 15 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 17 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 17 +- .../resources/Ambari-DDL-Postgres-CREATE.sql| 22 +- .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 20 +- .../BlueprintConfigurationProcessorTest.java| 142 ++-- .../internal/StageResourceProviderTest.java | 3 + .../orm/dao/TopologyLogicalRequestDAOTest.java | 8 +- .../server/orm/dao/TopologyRequestDAOTest.java | 3 +- .../topology/BlueprintValidatorImplTest.java| 181 + .../topology/ClusterTopologyImplTest.java | 41 +- .../server/topology/TopologyManagerTest.java| 298 46 files changed, 2595 insertions(+), 991 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java index 351f6b4..cfc9bc0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java @@ -33,6 +33,7 @@ import org.apache.ambari.server.controller.internal.ExportBlueprintRequest; import org.apache.ambari.server.controller.internal.ResourceImpl; import org.apache.ambari.server.controller.internal.Stack; import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.topology.AmbariContext; import org.apache.ambari.server.topology.ClusterTopology; import org.apache.ambari.server.topology.ClusterTopologyImpl; import org.apache.ambari.server.topology.Configuration; @@ -40,7 +41,6 @@ import org.apache.ambari.server.topology.HostGroup; import org.apache.ambari.server.topology.HostGroupInfo; import org.apache.ambari.server.topology.InvalidTopologyException; import org.apache.ambari.server.topology.InvalidTopologyTemplateException; -import org.apache.ambari.server.topology.NoSuchHostGroupExcept
[1/4] ambari git commit: AMBARI-10990. Implement topology manager persistence
Repository: ambari
Updated Branches:
refs/heads/trunk 8963501be -> 807b3c2df
http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
index bba45eb..fcffe95 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
@@ -34,6 +34,7 @@ import
org.apache.ambari.server.orm.entities.TopologyLogicalTaskEntity;
import org.apache.ambari.server.orm.entities.TopologyRequestEntity;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.Collection;
@@ -96,11 +97,13 @@ public class TopologyLogicalRequestDAOTest {
hostGroupEntity = hostGroupEntities.iterator().next();
TopologyLogicalRequestEntity logicalRequestEntity = new
TopologyLogicalRequestEntity();
+logicalRequestEntity.setId(1L);
logicalRequestEntity.setDescription("description");
logicalRequestEntity.setTopologyRequestEntity(requestEntity);
logicalRequestEntity.setTopologyRequestId(requestEntity.getId());
TopologyHostRequestEntity hostRequestEntity = new
TopologyHostRequestEntity();
+hostGroupEntity.setId(1L);
hostRequestEntity.setHostName("h1");
hostRequestEntity.setStageId(1L);
hostRequestEntity.setTopologyLogicalRequestEntity(logicalRequestEntity);
@@ -127,6 +130,7 @@ public class TopologyLogicalRequestDAOTest {
}
@Test
+ @Ignore
public void testFindAll() throws Exception {
create();
List logicalRequestEntities =
logicalRequestDAO.findAll();
@@ -134,7 +138,7 @@ public class TopologyLogicalRequestDAOTest {
TopologyLogicalRequestEntity logicalRequestEntity =
logicalRequestEntities.iterator().next();
Assert.assertNotNull(logicalRequestEntity.getTopologyRequestId());
-Assert.assertNotNull(logicalRequestEntity.getId());
+Assert.assertEquals(Long.valueOf(1), logicalRequestEntity.getId());
Assert.assertEquals("description", logicalRequestEntity.getDescription());
Assert.assertNotNull(logicalRequestEntity.getTopologyRequestEntity());
@@ -142,7 +146,7 @@ public class TopologyLogicalRequestDAOTest {
Assert.assertEquals(1, hostRequestEntities.size());
TopologyHostRequestEntity hostRequestEntity =
hostRequestEntities.iterator().next();
Assert.assertNotNull(hostRequestEntity.getTopologyHostGroupEntity());
-Assert.assertEquals("hg1", hostRequestEntity.getHostGroupName());
+
Assert.assertEquals(hostRequestEntity.getTopologyHostGroupEntity().getId(),
hostRequestEntity.getHostGroupId());
Collection taskEntities =
hostRequestEntity.getTopologyHostTaskEntities();
Assert.assertEquals(1, taskEntities.size());
http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
index b426c3f..2dd16c7 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
@@ -99,7 +99,8 @@ public class TopologyRequestDAOTest {
Collection infoEntities =
hostGroupEntity.getTopologyHostInfoEntities();
Assert.assertEquals(1, infoEntities.size());
TopologyHostInfoEntity infoEntity = infoEntities.iterator().next();
-Assert.assertEquals(hostGroupEntity.getName(), infoEntity.getGroupName());
+Assert.assertEquals("hg1", hostGroupEntity.getName());
+Assert.assertEquals(hostGroupEntity.getId(), infoEntity.getGroupId());
Assert.assertEquals("fqdn", infoEntity.getFqdn());
Assert.assertEquals(12, infoEntity.getHostCount().intValue());
Assert.assertEquals("predicate", infoEntity.getPredicate());
http://git-wip-us.apache.org/repos/asf/ambari/blob/807b3c2d/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
new file mode 100644
index 000..0b1573b
--- /dev/null
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/
ambari git commit: AMBARI-10986. HBase security authorization/authentication should set appropriate classes (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 2ca58368e -> 8963501be
AMBARI-10986. HBase security authorization/authentication should set
appropriate classes (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8963501b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8963501b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8963501b
Branch: refs/heads/trunk
Commit: 8963501be6c25ebd421d1935cb2a1ddb5b6ffee9
Parents: 2ca5836
Author: Srimanth Gunturi
Authored: Wed May 6 17:24:55 2015 -0700
Committer: Srimanth Gunturi
Committed: Wed May 6 19:05:31 2015 -0700
--
.../0.96.0.2.0/configuration/hbase-site.xml | 23 +++--
.../services/HBASE/configuration/hbase-site.xml | 10
.../stacks/HDP/2.2/services/stack_advisor.py| 51
.../stacks/2.2/common/test_stack_advisor.py | 42 +++-
4 files changed, 120 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8963501b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index bd6b72e..2122ce8 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -333,8 +333,7 @@
hbase.security.authentication
simple
- Controls whether or not secure authentication is enabled
for HBase. Possible values are 'simple'
- (no authentication), and 'kerberos'.
+Select Simple or Kerberos authentication. Note: Kerberos must
be set up before the Kerberos option will take effect.
Enable Authentication
@@ -364,11 +363,11 @@
true
- Enabled
+ Native
false
- Disabled
+ Off
1
@@ -384,6 +383,16 @@
it in HBase's classpath and add the fully qualified class name here.
A coprocessor can also be loaded on demand by setting HTableDescriptor.
+
+
+hbase-site
+hbase.security.authorization
+
+
+hbase-site
+hbase.security.authentication
+
+
@@ -396,6 +405,12 @@
implementing your own MasterObserver, just put it in HBase's classpath
and add the fully qualified class name here.
+
+
+hbase-site
+hbase.security.authorization
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/8963501b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index 13b91ed..4a9b84b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -137,4 +137,14 @@
+
+hbase.coprocessor.regionserver.classes
+
+
+
+hbase-site
+hbase.security.authorization
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/8963501b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 89e9ae7..0e08fdb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -481,6 +481,45 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putHbaseEnvProperty = self.putProperty(configurations, "hbase-env",
services)
putHbaseEnvProperty('hbase_max_direct_memory_size', '')
+# Authorization
+# If configurations has it - it has priority as it is calculated. Then,
the service's configurations will be used.
+hbase_security_authorization = None
+if 'hbase-site' in configurations and 'hbase.security.authorization' in
configurations['hbase-site']['properties']:
+ hbase_security_authorization =
configurations['hbase-site']['properties']['hbase.secu
ambari git commit: AMBARI-10904. Provide a configurable timeout setting on MetricsTimelineSink.emitMetrics. Sink connection problem. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 8cbe1e106 -> 2ca58368e
AMBARI-10904. Provide a configurable timeout setting on
MetricsTimelineSink.emitMetrics. Sink connection problem. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ca58368
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ca58368
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ca58368
Branch: refs/heads/trunk
Commit: 2ca58368e60671580e246199da392167c371338e
Parents: 8cbe1e1
Author: Siddharth Wagle
Authored: Wed May 6 18:12:39 2015 -0700
Committer: Siddharth Wagle
Committed: Wed May 6 18:12:39 2015 -0700
--
.../metrics2/sink/timeline/AbstractTimelineMetricsSink.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ca58368/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index 4b93f50..f18f52a 100644
---
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -54,6 +54,8 @@ public abstract class AbstractTimelineMetricsSink {
public AbstractTimelineMetricsSink() {
LOG = LogFactory.getLog(this.getClass());
+httpClient.getParams().setSoTimeout(getTimeoutSeconds() * 1000);
+httpClient.getParams().setConnectionManagerTimeout(getTimeoutSeconds() *
1000);
}
protected void emitMetrics(TimelineMetrics metrics) throws IOException {
@@ -65,10 +67,11 @@ public abstract class AbstractTimelineMetricsSink {
PostMethod postMethod = new PostMethod(connectUrl);
postMethod.setRequestEntity(requestEntity);
- postMethod.setParameter(HttpMethodParams.SO_TIMEOUT,
String.valueOf(getTimeoutSeconds() * 1000));
int statusCode = httpClient.executeMethod(postMethod);
+
if (statusCode != 200) {
-LOG.info("Unable to POST metrics to collector, " + connectUrl);
+LOG.info("Unable to POST metrics to collector, " + connectUrl + ", " +
+ "statusCode = " + statusCode);
} else {
LOG.debug("Metrics posted to Collector " + connectUrl);
}
ambari git commit: AMBARI-10983. Set datanucleus.autoCreateSchema=false for Hive to allow parallel start for HiveServer2 and Hive Metastore
Repository: ambari Updated Branches: refs/heads/trunk 73f4d8ee0 -> 8cbe1e106 AMBARI-10983. Set datanucleus.autoCreateSchema=false for Hive to allow parallel start for HiveServer2 and Hive Metastore Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8cbe1e10 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8cbe1e10 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8cbe1e10 Branch: refs/heads/trunk Commit: 8cbe1e1063ef26670862374ed2e9b713f4f92580 Parents: 73f4d8e Author: Sumit Mohanty Authored: Wed May 6 15:13:43 2015 -0700 Committer: Sumit Mohanty Committed: Wed May 6 15:13:43 2015 -0700 -- .../HIVE/0.12.0.2.0/configuration/hive-site.xml| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8cbe1e10/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml index 8715be2..2994cf4 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml @@ -91,6 +91,12 @@ limitations under the License. +datanucleus.autoCreateSchema +false +Creates necessary schema on a startup if one doesn't exist + + + hive.metastore.pre.event.listeners org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener Pre-event listener classes to be loaded on the metastore side to run code
ambari git commit: AMBARI-10980. Gauge widget has a black text appearing inside the color stroked text. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk d7e8a7969 -> 73f4d8ee0
AMBARI-10980. Gauge widget has a black text appearing inside the color stroked
text. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73f4d8ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73f4d8ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73f4d8ee
Branch: refs/heads/trunk
Commit: 73f4d8ee0569b48c994c946ad3b4e33b72813e29
Parents: d7e8a79
Author: Jaimin Jetly
Authored: Wed May 6 14:36:31 2015 -0700
Committer: Jaimin Jetly
Committed: Wed May 6 14:36:31 2015 -0700
--
ambari-web/app/views/common/chart/pie.js| 1 +
ambari-web/app/views/common/widget/gauge_widget_view.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/73f4d8ee/ambari-web/app/views/common/chart/pie.js
--
diff --git a/ambari-web/app/views/common/chart/pie.js
b/ambari-web/app/views/common/chart/pie.js
index e609cd6..0bc09f3 100644
--- a/ambari-web/app/views/common/chart/pie.js
+++ b/ambari-web/app/views/common/chart/pie.js
@@ -71,6 +71,7 @@ App.ChartPieView = Em.View.extend({
.append("svg:g")
.attr("render-order", 1)
.append("svg:text")
+.style('fill', thisChart.get('centerTextColor'))
.attr("stroke", thisChart.get('centerTextColor'))
.attr("font-size", 17)
.attr("transform", "translate(" + thisChart.get('w') / 2 + "," +
((thisChart.get('h') / 2) + 3) + ")")
http://git-wip-us.apache.org/repos/asf/ambari/blob/73f4d8ee/ambari-web/app/views/common/widget/gauge_widget_view.js
--
diff --git a/ambari-web/app/views/common/widget/gauge_widget_view.js
b/ambari-web/app/views/common/widget/gauge_widget_view.js
index 4ce8ebb..21f6f95 100644
--- a/ambari-web/app/views/common/widget/gauge_widget_view.js
+++ b/ambari-web/app/views/common/widget/gauge_widget_view.js
@@ -33,7 +33,7 @@ App.GaugeWidgetView = Em.View.extend(App.WidgetMixin, {
metrics: [],
chartView: App.ChartPieView.extend({
-stroke: '#D6DDDF',
+stroke: '#D6DDDF', //light grey
innerR: 25,
/**
ambari git commit: AMBARI-10979. MRv2 Config Screen allows me to allocate sort buffers larger than heap. (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 44bfa35db -> d7e8a7969
AMBARI-10979. MRv2 Config Screen allows me to allocate sort buffers larger than
heap. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7e8a796
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7e8a796
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7e8a796
Branch: refs/heads/trunk
Commit: d7e8a796916e264222eb44672fd65619dcb2108c
Parents: 44bfa35
Author: Srimanth Gunturi
Authored: Wed May 6 14:00:12 2015 -0700
Committer: Srimanth Gunturi
Committed: Wed May 6 14:00:12 2015 -0700
--
.../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py | 5 +++--
.../src/test/python/stacks/2.2/common/test_stack_advisor.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e8a796/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 53f278b..89e9ae7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -526,9 +526,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putMapredProperty('yarn.app.mapreduce.am.command-opts', "-Xmx" +
str(int(0.8 *
int(configurations["mapred-site"]["properties"]["yarn.app.mapreduce.am.resource.mb"])))
+ "m" + " -Dhdp.version=${hdp.version}")
putMapredProperty('mapreduce.map.memory.mb',
int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"]))
putMapredProperty('mapreduce.reduce.memory.mb',
min(2*int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"]),
int(nodemanagerMinRam)))
-putMapredProperty('mapreduce.map.java.opts', "-Xmx" +
str(int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"])))
+ "m")
+mapredMapXmx =
int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"]));
+putMapredProperty('mapreduce.map.java.opts', "-Xmx" + str(mapredMapXmx) +
"m")
putMapredProperty('mapreduce.reduce.java.opts', "-Xmx" +
str(int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.reduce.memory.mb"])))
+ "m")
-putMapredProperty('mapreduce.task.io.sort.mb',
str(min(int(0.7*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"])),
2047)))
+putMapredProperty('mapreduce.task.io.sort.mb',
str(min(int(0.7*mapredMapXmx), 2047)))
# Property Attributes
putMapredPropertyAttribute = self.putPropertyAttribute(configurations,
"mapred-site")
yarnMinAllocationSize =
int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"])
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e8a796/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 46edea4..41ee352 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -1109,7 +1109,7 @@ class TestHDP22StackAdvisor(TestCase):
"mapreduce.reduce.java.opts": "-Xmx160m",
"yarn.app.mapreduce.am.resource.mb": "100",
"mapreduce.map.java.opts": "-Xmx80m",
- "mapreduce.task.io.sort.mb": "70"
+ "mapreduce.task.io.sort.mb": "56"
},
"property_attributes": {
'mapreduce.task.io.sort.mb': {'maximum': '2047'},
ambari git commit: AMBARI-10972. Add 'Set Recommended Value' action to configs with recommended value (onechiporenko via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk e4613a328 -> 44bfa35db
AMBARI-10972. Add 'Set Recommended Value' action to configs with recommended
value (onechiporenko via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44bfa35d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44bfa35d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44bfa35d
Branch: refs/heads/trunk
Commit: 44bfa35dbb72380ca8608b43b1cd12158f9f26b3
Parents: e4613a3
Author: Srimanth Gunturi
Authored: Wed May 6 13:03:38 2015 -0700
Committer: Srimanth Gunturi
Committed: Wed May 6 13:10:35 2015 -0700
--
ambari-web/app/messages.js | 1 +
.../configs/objects/service_config_property.js | 11 +++--
ambari-web/app/styles/application.less | 13 +-
ambari-web/app/styles/widgets.less | 5 ++--
.../templates/common/configs/service_config.hbs | 2 +-
.../common/configs/service_config_category.hbs | 7 ++
.../common/configs/service_config_wizard.hbs| 2 +-
.../common/configs/widgets/controls.hbs | 6 +
.../views/common/configs/service_config_view.js | 6 +
.../configs/service_configs_by_category_view.js | 10
.../widgets/checkbox_config_widget_view.js | 9 ++-
.../configs/widgets/combo_config_widget_view.js | 7 ++
.../configs/widgets/config_widget_view.js | 7 +-
.../configs/widgets/list_config_widget_view.js | 8 ++
.../widgets/slider_config_widget_view.js| 26 +---
.../widgets/toggle_config_widget_view.js| 7 ++
16 files changed, 109 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/44bfa35d/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5d85b19..c846e5a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1751,6 +1751,7 @@ Em.I18n.translations = {
'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss',
'services.service.config.configHistory.makeCurrent.message': 'Created from
service config version {0}',
'services.service.config.configHistory.comparing': 'Comparing',
+ 'services.service.config.setRecommendedValue': 'Set Recommended Value',
'services.service.widgets.list-widget.nothingSelected': 'Nothing selected',
http://git-wip-us.apache.org/repos/asf/ambari/blob/44bfa35d/ambari-web/app/models/configs/objects/service_config_property.js
--
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js
b/ambari-web/app/models/configs/objects/service_config_property.js
index 554e094..eeec1b1 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -64,7 +64,7 @@ App.ServiceConfigProperty = Em.Object.extend({
showLabel: true,
error: false,
warn: false,
- overrideErrorTrigger: 0, //Trigger for overrridable property error
+ overrideErrorTrigger: 0, //Trigger for overridable property error
isRestartRequired: false,
restartRequiredMessage: 'Restart required',
index: null, //sequence number in category
@@ -78,7 +78,14 @@ App.ServiceConfigProperty = Em.Object.extend({
* value that is returned from server as recommended
* @type {String}
*/
- recommendedValue: '',
+ recommendedValue: null,
+
+ /**
+ * @type {boolean}
+ */
+ recommendedValueExists: function () {
+return !Em.isNone(this.get('recommendedValue'));
+ }.property('recommendedValue'),
/**
* Usage example see on
App.ServiceConfigRadioButtons.handleDBConnectionProperty()
http://git-wip-us.apache.org/repos/asf/ambari/blob/44bfa35d/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 95824fb..645d1c4 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1322,6 +1322,17 @@ h1 {
}
}
}
+
+ .config-tabs {
+margin-bottom: @space-m * 2;
+ }
+
+ .serviceConfigs {
+.config-tabs {
+ margin-top: -55px;
+}
+ }
+
}
.running-host-components-table{
@@ -5359,7 +5370,7 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
margin-top: @space-m;
}
-.mbm { margin-bottom: @space-m * 2; margin-top: -55px; }
+.mbm { margin-bottom: @space-m; }
.mll {
margin-left: @space-l;
http://git-wip-us.apache.org/repos/asf/ambari/blob/44bfa35d/ambari-web/app/styles/widgets.less
-
ambari git commit: AMBARI-10965 - Views: @Inject using com.google.inject.Inject is broken. (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 990af9d26 -> 3608de943
AMBARI-10965 - Views: @Inject using com.google.inject.Inject is broken.
(tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3608de94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3608de94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3608de94
Branch: refs/heads/branch-2.0.maint
Commit: 3608de9431a2f5aee615369d0831d5c1a2018c3c
Parents: 990af9d
Author: tbeerbower
Authored: Wed May 6 16:03:38 2015 -0400
Committer: tbeerbower
Committed: Wed May 6 16:05:28 2015 -0400
--
.../ambari/server/view/ViewClassLoader.java | 20
.../ambari/server/view/ViewClassLoaderTest.java | 8
2 files changed, 24 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3608de94/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
index ad8c805..5b0c317 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
@@ -53,13 +53,25 @@ public class ViewClassLoader extends WebAppClassLoader {
* @param urlsthe URLs from which to load classes and resources
*/
public ViewClassLoader(ClassLoader parent, URL[] urls) throws IOException {
-// Use no-arg web app context to initialize the class loader. For now we
are just using the default context
-// values for things like parent loader priority and server classes. In
the future we may allow overrides at
-// the view level.
-super(parent, new WebAppContext());
+super(parent, getInitContext());
for (URL url : urls) {
addURL(url);
}
}
+
+
+ // - helper methods
+
+ // Get a context to initialize the class loader.
+ private static WebAppContext getInitContext() {
+// For now we are using defaults or setting the values for things like
parent loader priority and
+// system classes. In the future we may allow overrides at the view level.
+WebAppContext webAppContext = new WebAppContext();
+
+// add com.google.inject as system classes to allow for injection in view
components using the google annotation
+webAppContext.addSystemClass("com.google.inject.");
+
+return webAppContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3608de94/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
index 3a9ecd3..b6a1396 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
@@ -71,6 +71,7 @@ public class ViewClassLoaderTest {
expect(parentClassLoader.loadClass("java.lang.Object")).andReturn(parentClass).anyTimes();
expect(parentClassLoader.loadClass("ParentClass")).andReturn(parentClass).once();
expect(parentClassLoader.loadClass("javax.xml.parsers.SAXParserFactory")).andReturn(parentClass).once();
+
expect(parentClassLoader.loadClass("com.google.inject.AbstractModule")).andReturn(parentClass).once();
replay(parentClassLoader);
@@ -90,11 +91,18 @@ public class ViewClassLoaderTest {
Assert.assertNotNull(clazz);
Assert.assertSame(parentClass, clazz);
+// should be loaded by parent loader
clazz = classLoader.loadClass("javax.xml.parsers.SAXParserFactory");
Assert.assertNotNull(clazz);
Assert.assertSame(parentClass, clazz);
+// should be loaded by parent loader
+clazz = classLoader.loadClass("com.google.inject.AbstractModule");
+
+Assert.assertNotNull(clazz);
+Assert.assertSame(parentClass, clazz);
+
verify(parentClassLoader);
}
ambari git commit: AMBARI-10965 - Views: @Inject using com.google.inject.Inject is broken. (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 7473b1d70 -> e4613a328
AMBARI-10965 - Views: @Inject using com.google.inject.Inject is broken.
(tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4613a32
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4613a32
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4613a32
Branch: refs/heads/trunk
Commit: e4613a328683f49eb6e89da3aa5efa964af77fcc
Parents: 7473b1d
Author: tbeerbower
Authored: Wed May 6 16:03:38 2015 -0400
Committer: tbeerbower
Committed: Wed May 6 16:03:52 2015 -0400
--
.../ambari/server/view/ViewClassLoader.java | 20
.../ambari/server/view/ViewClassLoaderTest.java | 8
2 files changed, 24 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4613a32/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
index ad8c805..5b0c317 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
@@ -53,13 +53,25 @@ public class ViewClassLoader extends WebAppClassLoader {
* @param urlsthe URLs from which to load classes and resources
*/
public ViewClassLoader(ClassLoader parent, URL[] urls) throws IOException {
-// Use no-arg web app context to initialize the class loader. For now we
are just using the default context
-// values for things like parent loader priority and server classes. In
the future we may allow overrides at
-// the view level.
-super(parent, new WebAppContext());
+super(parent, getInitContext());
for (URL url : urls) {
addURL(url);
}
}
+
+
+ // - helper methods
+
+ // Get a context to initialize the class loader.
+ private static WebAppContext getInitContext() {
+// For now we are using defaults or setting the values for things like
parent loader priority and
+// system classes. In the future we may allow overrides at the view level.
+WebAppContext webAppContext = new WebAppContext();
+
+// add com.google.inject as system classes to allow for injection in view
components using the google annotation
+webAppContext.addSystemClass("com.google.inject.");
+
+return webAppContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4613a32/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
index 3a9ecd3..b6a1396 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
@@ -71,6 +71,7 @@ public class ViewClassLoaderTest {
expect(parentClassLoader.loadClass("java.lang.Object")).andReturn(parentClass).anyTimes();
expect(parentClassLoader.loadClass("ParentClass")).andReturn(parentClass).once();
expect(parentClassLoader.loadClass("javax.xml.parsers.SAXParserFactory")).andReturn(parentClass).once();
+
expect(parentClassLoader.loadClass("com.google.inject.AbstractModule")).andReturn(parentClass).once();
replay(parentClassLoader);
@@ -90,11 +91,18 @@ public class ViewClassLoaderTest {
Assert.assertNotNull(clazz);
Assert.assertSame(parentClass, clazz);
+// should be loaded by parent loader
clazz = classLoader.loadClass("javax.xml.parsers.SAXParserFactory");
Assert.assertNotNull(clazz);
Assert.assertSame(parentClass, clazz);
+// should be loaded by parent loader
+clazz = classLoader.loadClass("com.google.inject.AbstractModule");
+
+Assert.assertNotNull(clazz);
+Assert.assertSame(parentClass, clazz);
+
verify(parentClassLoader);
}
ambari git commit: AMBARI-10970. 'hive.auto.convert.join.noconditionaltask.size' - Installer showing warning even when value seems to be in bounds (onechiporenko via srimanth)
Repository: ambari Updated Branches: refs/heads/trunk be9066f6d -> 7473b1d70 AMBARI-10970. 'hive.auto.convert.join.noconditionaltask.size' - Installer showing warning even when value seems to be in bounds (onechiporenko via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7473b1d7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7473b1d7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7473b1d7 Branch: refs/heads/trunk Commit: 7473b1d7097edb787a73638a32a06d54dc3c739b Parents: be9066f Author: Srimanth Gunturi Authored: Wed May 6 11:56:14 2015 -0700 Committer: Srimanth Gunturi Committed: Wed May 6 11:56:14 2015 -0700 -- .../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7473b1d7/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 0c27f48..f77977d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -1398,7 +1398,7 @@ limitations under the License. For Map Join, per Map memory threshold int - 1073741824 + 8192 17179869184 B
ambari git commit: AMBARI-10967. Rpc scheduler factory class config parameter is misspelled (Ted Yu via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk a9c47820e -> be9066f6d
AMBARI-10967. Rpc scheduler factory class config parameter is misspelled (Ted
Yu via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be9066f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be9066f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be9066f6
Branch: refs/heads/trunk
Commit: be9066f6dd046eee1dd9efd6960901d147e2ccbb
Parents: a9c4782
Author: Srimanth Gunturi
Authored: Wed May 6 11:39:45 2015 -0700
Committer: Srimanth Gunturi
Committed: Wed May 6 11:39:45 2015 -0700
--
.../main/resources/stacks/HDP/2.2/services/stack_advisor.py| 4 ++--
.../src/test/python/stacks/2.2/common/test_stack_advisor.py| 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/be9066f6/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index fd3da2e..53f278b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -426,12 +426,12 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in
services['configurations']['hbase-env']['properties']:
if 'true' ==
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
-putHbaseSiteProperty("hbase.regionserver.rpc.scheduler.factory.class",
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory")
+
putHbaseSiteProperty("hbase.region.server.rpc.scheduler.factory.class",
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory")
putHbaseSiteProperty("hbase.rpc.controllerfactory.class",
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory")
putHbaseSiteProperty("hbase.regionserver.wal.codec",
'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec')
else:
putHbaseSiteProperty("hbase.regionserver.wal.codec",
'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec')
-
putHbaseSitePropertyAttributes('hbase.regionserver.rpc.scheduler.factory.class',
'delete', 'true')
+
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'delete', 'true')
putHbaseSitePropertyAttributes('hbase.rpc.controllerfactory.class',
'delete', 'true')
servicesList = [service["StackServices"]["service_name"] for service in
services["services"]]
http://git-wip-us.apache.org/repos/asf/ambari/blob/be9066f6/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index fa55a4f..46edea4 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -1432,7 +1432,7 @@ class TestHDP22StackAdvisor(TestCase):
"hbase-site": {
"properties": {
"hbase.regionserver.wal.codec":
"org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec",
- "hbase.regionserver.rpc.scheduler.factory.class":
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory",
+ "hbase.region.server.rpc.scheduler.factory.class":
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory",
"hbase.rpc.controllerfactory.class":
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory",
"hbase.bucketcache.size": "",
"hbase.bucketcache.percentage.in.combinedcache": "",
@@ -1459,7 +1459,7 @@ class TestHDP22StackAdvisor(TestCase):
# Test when phoenix_sql_enabled = false
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'] =
'false'
expected['hbase-site']['properties']['hbase.regionserver.wal.codec'] =
'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec'
-expected['hbase-site']['property_attributes'] =
{'hbase.regionserver.rpc.scheduler.factory.class': {'delete': 'true'},
'hbase.rpc.controllerfactory.class': {'delete': 'true'}}
+expected['hbase-site']['property_attributes'] =
{'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'},
'hbase.rpc.controllerfactory.class': {'delete': 'true'}}
self.stackAdvisor.recommendHBASEConfigurations(configurations,
clusterData, services, None)
ambari git commit: AMBARI-10969. Recommendations API error on changing hive.server2.authentication. (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 4699a1b75 -> a9c47820e
AMBARI-10969. Recommendations API error on changing
hive.server2.authentication. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9c47820
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9c47820
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9c47820
Branch: refs/heads/trunk
Commit: a9c47820e75ab9213aeba5ef1e73a6813fb6a4c7
Parents: 4699a1b
Author: Srimanth Gunturi
Authored: Wed May 6 11:25:58 2015 -0700
Committer: Srimanth Gunturi
Committed: Wed May 6 11:31:36 2015 -0700
--
ambari-server/src/main/resources/stacks/stack_advisor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c47820/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 06389d5..767e565 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -710,7 +710,7 @@ class DefaultStackAdvisor(StackAdvisor):
if type in requestedProperties.keys() and \
name in requestedProperties[type]:
if type not in filteredConfigs.keys():
- filteredConfigs[type] = {'property_Attributes': {}}
+ filteredConfigs[type] = {'property_attributes': {}}
elif 'property_attributes' not in filteredConfigs[type].keys():
filteredConfigs[type]['property_attributes'] = {}
filteredConfigs[type]['property_attributes'][name] = \
ambari git commit: AMBARi-10964. Deleting a widget fails.
Repository: ambari
Updated Branches:
refs/heads/trunk 690dfde82 -> 4699a1b75
AMBARi-10964. Deleting a widget fails.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4699a1b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4699a1b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4699a1b7
Branch: refs/heads/trunk
Commit: 4699a1b75811aace747dc9c87072b29b8b41fbd1
Parents: 690dfde
Author: Siddharth Wagle
Authored: Wed May 6 10:30:23 2015 -0700
Committer: Siddharth Wagle
Committed: Wed May 6 10:30:23 2015 -0700
--
.../internal/WidgetLayoutResourceProvider.java | 4 ++--
.../WidgetLayoutResourceProviderTest.java | 22 ++--
2 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4699a1b7/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
index 68dc4e9..8f068d5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
@@ -172,7 +172,7 @@ public class WidgetLayoutResourceProvider extends
AbstractControllerResourceProv
widgetLayoutUserWidgetEntity.setWidgetOrder(order++);
widgetLayoutUserWidgetEntity.setWidgetLayout(entity);
widgetLayoutUserWidgetEntityList.add(widgetLayoutUserWidgetEntity);
-
+
widgetEntity.getListWidgetLayoutUserWidgetEntity().add(widgetLayoutUserWidgetEntity);
}
entity.setListWidgetLayoutUserWidgetEntity(widgetLayoutUserWidgetEntityList);
@@ -301,7 +301,7 @@ public class WidgetLayoutResourceProvider extends
AbstractControllerResourceProv
widgetLayoutUserWidgetEntity.setWidgetOrder(order++);
widgetLayoutUserWidgetEntity.setWidgetLayout(entity);
widgetLayoutUserWidgetEntityList.add(widgetLayoutUserWidgetEntity);
-
+
widgetEntity.getListWidgetLayoutUserWidgetEntity().add(widgetLayoutUserWidgetEntity);
}
entity.setListWidgetLayoutUserWidgetEntity(widgetLayoutUserWidgetEntityList);
http://git-wip-us.apache.org/repos/asf/ambari/blob/4699a1b7/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
index dda0598..1a9e230 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
@@ -31,7 +31,9 @@ import
org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.metadata.ActionMetadata;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.orm.dao.WidgetDAO;
import org.apache.ambari.server.orm.dao.WidgetLayoutDAO;
+import org.apache.ambari.server.orm.entities.WidgetEntity;
import org.apache.ambari.server.orm.entities.WidgetLayoutEntity;
import org.apache.ambari.server.orm.entities.WidgetLayoutUserWidgetEntity;
import org.apache.ambari.server.state.Cluster;
@@ -42,6 +44,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -51,6 +54,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import static org.easymock.EasyMock.anyLong;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMock;
@@ -68,11 +72,13 @@ import static org.junit.Assert.assertEquals;
public class WidgetLayoutResourceProviderTest {
private WidgetLayoutDAO dao = null;
+ private WidgetDAO widgetDAO = null;
private Injector m_injector;
@Before
public void before() {
dao = createStrictMock(WidgetLayoutDAO.class);
+widgetDAO = createStrictMock(WidgetDAO.class);
m_injector = Guice.createInjec
[1/2] ambari git commit: Revert "AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)"
Repository: ambari
Updated Branches:
refs/heads/trunk 6182ef3c8 -> 690dfde82
Revert "AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)"
This reverts commit 29e1ad6a178ee17757da1b1faf85123bb6200976.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03e0836b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03e0836b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03e0836b
Branch: refs/heads/trunk
Commit: 03e0836b07e81d31e3ef103517ccb6183da86cde
Parents: 6182ef3
Author: Robert Levas
Authored: Wed May 6 13:22:19 2015 -0400
Committer: Robert Levas
Committed: Wed May 6 13:22:19 2015 -0400
--
.../common-services/OOZIE/5.0.0.2.3/alerts.json | 44 -
.../5.0.0.2.3/configuration/oozie-site.xml | 167 -
.../OOZIE/5.0.0.2.3/metainfo.xml| 177 ---
.../2.3.GlusterFS/services/OOZIE/metainfo.xml | 48 -
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 45 -
.../server/stack/KerberosDescriptorTest.java| 9 +-
6 files changed, 90 insertions(+), 400 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
deleted file mode 100644
index 4bfae15..000
---
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "OOZIE": {
-"service": [],
-"OOZIE_SERVER": [
- {
-"name": "oozie_server_webui",
-"label": "Oozie Server Web UI",
-"description": "This host-level alert is triggered if the Oozie server
Web UI is unreachable.",
-"interval": 1,
-"scope": "ANY",
-"source": {
- "type": "WEB",
- "uri": {
-"http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
-"kerberos_keytab":
"{{oozie-site/oozie.authentication.kerberos.keytab}}",
-"kerberos_principal":
"{{oozie-site/oozie.authentication.kerberos.principal}}"
- },
- "reporting": {
-"ok": {
- "text": "HTTP {0} response in {2:.3f}s"
-},
-"warning":{
- "text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
-},
-"critical": {
- "text": "Connection failed to {1} ({3})"
-}
- }
-}
- },
- {
-"name": "oozie_server_status",
-"label": "Oozie Server Status",
-"description": "This host-level alert is triggered if the Oozie server
cannot be determined to be up and responding to client requests.",
-"interval": 1,
-"scope": "ANY",
-"source": {
- "type": "SCRIPT",
- "path": "OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py"
-}
- }
-]
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
deleted file mode 100644
index b17e4cd..000
---
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-oozie.authentication.kerberos.name.rules
-
- RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
- RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
- RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
- RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
- DEFAULT
-
-The mapping from kerberos principal names to local OS user
names.
-
-
-
-oozie.authentication.type
-simple
-
- Authentication used for Oozie HTTP endpoint, the supported values are:
simple | kerberos |
- #AUTHENTICATION_HANDLER_CLASSNAME#.
-
-
-
-
-oozie.base.url
-http://localhost:11000/oozie
-Base Oozie URL.
-
-
-
-oozie.credentials.credentialclasses
-hcat=org.apache.oozie.action.hadoop.HCatCredentials
-
- Credential Class to be used for HCat.
-
-
-
-
-oozie.service.AuthorizationService.authorization.enabled
-false
-
- Specifies whether security (user name/admin role) is enabled or not.
-
[2/2] ambari git commit: AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)
AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/690dfde8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/690dfde8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/690dfde8
Branch: refs/heads/trunk
Commit: 690dfde82eab74d8a6399ec31741d20108fae085
Parents: 03e0836
Author: Robert Levas
Authored: Wed May 6 13:26:40 2015 -0400
Committer: Robert Levas
Committed: Wed May 6 13:26:40 2015 -0400
--
.../common-services/OOZIE/5.0.0.2.3/alerts.json | 44 +
.../5.0.0.2.3/configuration/oozie-site.xml | 167 +
.../OOZIE/5.0.0.2.3/metainfo.xml| 177 +++
.../2.3.GlusterFS/services/OOZIE/metainfo.xml | 48 +
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 45 +
.../server/stack/KerberosDescriptorTest.java| 4 +-
6 files changed, 395 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
new file mode 100644
index 000..4bfae15
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
@@ -0,0 +1,44 @@
+{
+ "OOZIE": {
+"service": [],
+"OOZIE_SERVER": [
+ {
+"name": "oozie_server_webui",
+"label": "Oozie Server Web UI",
+"description": "This host-level alert is triggered if the Oozie server
Web UI is unreachable.",
+"interval": 1,
+"scope": "ANY",
+"source": {
+ "type": "WEB",
+ "uri": {
+"http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
+"kerberos_keytab":
"{{oozie-site/oozie.authentication.kerberos.keytab}}",
+"kerberos_principal":
"{{oozie-site/oozie.authentication.kerberos.principal}}"
+ },
+ "reporting": {
+"ok": {
+ "text": "HTTP {0} response in {2:.3f}s"
+},
+"warning":{
+ "text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
+},
+"critical": {
+ "text": "Connection failed to {1} ({3})"
+}
+ }
+}
+ },
+ {
+"name": "oozie_server_status",
+"label": "Oozie Server Status",
+"description": "This host-level alert is triggered if the Oozie server
cannot be determined to be up and responding to client requests.",
+"interval": 1,
+"scope": "ANY",
+"source": {
+ "type": "SCRIPT",
+ "path": "OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py"
+}
+ }
+]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
new file mode 100644
index 000..b17e4cd
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+oozie.authentication.kerberos.name.rules
+
+ RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
+ RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
+ RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ DEFAULT
+
+The mapping from kerberos principal names to local OS user
names.
+
+
+
+oozie.authentication.type
+simple
+
+ Authentication used for Oozie HTTP endpoint, the supported values are:
simple | kerberos |
+ #AUTHENTICATION_HANDLER_CLASSNAME#.
+
+
+
+
+oozie.base.url
+http://localhost:11000/oozie
+Base Oozie URL.
+
+
+
+oozie.credentials.credentialclasses
+hcat=org.apache.oozie.action.hadoop.HCatCredentials
+
+ Credential Class to be used for HCat.
+
+
+
+
+oozie.service.AuthorizationService.authorization.enabled
+false
+
+ Specifies whether security (user name/admin role) is enabled or not.
+ If disabled any user can manage Oozie system and manage any job.
+
+
+
+
+oozie.service.HadoopAccessorService.hadoop.configurations
+*=/etc/hadoo
ambari git commit: AMBARI-10963. Change default for hive conditional task size to 52428800
Repository: ambari Updated Branches: refs/heads/trunk 0041836a2 -> 6182ef3c8 AMBARI-10963. Change default for hive conditional task size to 52428800 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6182ef3c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6182ef3c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6182ef3c Branch: refs/heads/trunk Commit: 6182ef3c86ba30618f2653116a8cfc9e82b8954c Parents: 0041836 Author: Sumit Mohanty Authored: Wed May 6 10:17:01 2015 -0700 Committer: Sumit Mohanty Committed: Wed May 6 10:17:01 2015 -0700 -- .../services/HIVE/configuration/hive-site.xml |2 +- .../HIVE/configuration/hive-site.xml.orig | 1691 ++ 2 files changed, 1692 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6182ef3c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 0da7b1c..0c27f48 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -1390,7 +1390,7 @@ limitations under the License. hive.auto.convert.join.noconditionaltask.size -2147483648 +52428800 If hive.auto.convert.join.noconditionaltask is off, this parameter does not take affect. However, if it is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly converted to a mapjoin(there is no conditional task). The default is 10MB. http://git-wip-us.apache.org/repos/asf/ambari/blob/6182ef3c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml.orig -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml.orig b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml.orig new file mode 100644 index 000..0da7b1c --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml.orig @@ -0,0 +1,1691 @@ + + + + + + + +hive.cbo.enable +true +Flag to control enabling Cost Based Optimizations using Calcite framework. +Enable Cost Based Optimizer + + value-list + + + true + On + + + false + Off + + + 1 + + + + +hive.zookeeper.quorum +localhost:2181 +List of ZooKeeper servers to talk to. This is needed for: 1. + Read/write locks - when hive.lock.manager is set to + org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager, + 2. When HiveServer2 supports service discovery via Zookeeper. + + + +hive.metastore.connect.retries +24 +Number of retries while opening a connection to metastore + + + +hive.metastore.failure.retries +24 +Number of retries upon failure of Thrift metastore calls + + + +hive.metastore.client.connect.retry.delay +5s + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + Number of seconds for the client to wait between consecutive connection attempts + + + + +hive.metastore.client.socket.timeout +1800s + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + MetaStore Client socket timeout in seconds + + + + +hive.mapjoin.bucket.cache.size +1 + + + + +hive.security.authorization.manager + org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory + + The Hive client authorization manager class name. The user defined authorization class should implement + interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. + + + + +hive.cluster.delegation.token.store.class +org.apache.hadoop.hive.thrift.ZooKeeperTokenStore +The delegation token store implementation. + Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster. + + + +hive.cluster.delegation.token.store.zookeeper.connectString +localhost:2181 +The ZooKeeper token store connect string. + + + +hive.server2.support.dynamic.serv
ambari git commit: AMBARI-10959. Reduce time between ActionScheduler wakeups (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 85217fa60 -> 990af9d26
AMBARI-10959. Reduce time between ActionScheduler wakeups (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/990af9d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/990af9d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/990af9d2
Branch: refs/heads/branch-2.0.maint
Commit: 990af9d26f3804205479fd78f180ba1291b42a1c
Parents: 85217fa
Author: Lisnichenko Dmitro
Authored: Wed May 6 17:08:29 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Wed May 6 20:12:21 2015 +0300
--
.../java/org/apache/ambari/server/controller/ControllerModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/990af9d2/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 8afa0bb..8061c43 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -292,7 +292,7 @@ public class ControllerModule extends AbstractModule {
bind(Clusters.class).to(ClustersImpl.class);
bind(AmbariCustomCommandExecutionHelper.class);
bind(ActionDBAccessor.class).to(ActionDBAccessorImpl.class);
-bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(1L);
+bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(1000L);
// This time is added to summary timeout time of all tasks in stage
// So it's an "additional time", given to stage to finish execution before
ambari git commit: AMBARI-10955. Remove element from gluster 2.1 and 2.2 stack defs (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/branch-2.0.maint 6df463193 -> 85217fa60 AMBARI-10955. Remove element from gluster 2.1 and 2.2 stack defs (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85217fa6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85217fa6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85217fa6 Branch: refs/heads/branch-2.0.maint Commit: 85217fa60b3ffb9f426504cc7640278a9479517c Parents: 6df4631 Author: Lisnichenko Dmitro Authored: Wed May 6 15:06:21 2015 +0300 Committer: Lisnichenko Dmitro Committed: Wed May 6 20:04:25 2015 +0300 -- .../main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml| 3 +-- .../main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml| 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/85217fa6/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml index 216e41d..cfee6f5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml @@ -16,8 +16,7 @@ limitations under the License. --> - - http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json http://git-wip-us.apache.org/repos/asf/ambari/blob/85217fa6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml index 7acb8b9..66897d5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml @@ -16,7 +16,7 @@ limitations under the License. --> - http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0
ambari git commit: AMBARI-10902 Bootstrap on Windows: Retrying commands adds garbage data to stdout
Repository: ambari Updated Branches: refs/heads/trunk 8ce46ac26 -> 0041836a2 AMBARI-10902 Bootstrap on Windows: Retrying commands adds garbage data to stdout Fixed retry message placement Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0041836a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0041836a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0041836a Branch: refs/heads/trunk Commit: 0041836a232ca25f71271757460548fe777baa0e Parents: 8ce46ac Author: Florian Barca Authored: Wed May 6 09:55:52 2015 -0700 Committer: Florian Barca Committed: Wed May 6 09:55:52 2015 -0700 -- ambari-server/src/main/python/setupAgent.py | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0041836a/ambari-server/src/main/python/setupAgent.py -- diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py index a762d54..7a8d545 100755 --- a/ambari-server/src/main/python/setupAgent.py +++ b/ambari-server/src/main/python/setupAgent.py @@ -50,7 +50,7 @@ def _ret_append_stdout(ret, stdout): temp_stderr = ret['log'][1] if stdout: if temp_stdout: - temp_stdout += "\n" + temp_stdout += os.linesep temp_stdout += stdout ret['log'] = (temp_stdout, temp_stderr) @@ -59,7 +59,7 @@ def _ret_append_stderr(ret, stderr): temp_stderr = ret['log'][1] if stderr: if temp_stderr: - temp_stderr += "\n" + temp_stderr += os.linesep temp_stderr += stderr ret['log'] = (temp_stdout, temp_stderr) @@ -69,11 +69,11 @@ def _ret_merge(ret, retcode, stdout, stderr): temp_stderr = ret['log'][1] if stdout: if temp_stdout: - temp_stdout += "\n" + temp_stdout += os.linesep temp_stdout += stdout if stderr: if temp_stderr: - temp_stderr += "\n" + temp_stderr += os.linesep temp_stderr += stderr ret['log'] = (temp_stdout, temp_stderr) return ret @@ -89,14 +89,13 @@ def execOsCommand(osCommand, tries=1, try_sleep=0, ret=None, cwd=None): for i in range(0, tries): if i > 0: time.sleep(try_sleep) + _ret_append_stderr(ret, "Retrying " + str(osCommand)) retcode, stdout, stderr = run_os_command(osCommand, cwd=cwd) _ret_merge(ret, retcode, stdout, stderr) if retcode == 0: break -_ret_append_stdout(ret, "\nRetrying " + str(osCommand)) - return ret @OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
ambari git commit: AMBARI-10901 [WinTP2] Ambari Service silent setup doesn't customize the service logon account
Repository: ambari
Updated Branches:
refs/heads/trunk a1effe19f -> 8ce46ac26
AMBARI-10901 [WinTP2] Ambari Service silent setup doesn't customize the service
logon account
Fixed variable assignment in the Windows user checks
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ce46ac2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ce46ac2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ce46ac2
Branch: refs/heads/trunk
Commit: 8ce46ac2614a2da6b62b54fa6df3789dc6b75b6d
Parents: a1effe1
Author: Florian Barca
Authored: Wed May 6 09:52:05 2015 -0700
Committer: Florian Barca
Committed: Wed May 6 09:52:30 2015 -0700
--
.../src/main/python/ambari_server/serverSetup.py | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce46ac2/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 9986422..4547145 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -210,18 +210,18 @@ class AmbariUserChecksWindows(AmbariUserChecks):
self.NR_DEFAULT_USER = "NT AUTHORITY\\SYSTEM"
self.NR_SYSTEM_USERS = ["NT AUTHORITY\\SYSTEM", "NT
AUTHORITY\\NetworkService", "NT AUTHORITY\\LocalService"]
-self.username = options.svc_user
+self.user = options.svc_user
self.password = options.svc_password
def _create_custom_user(self):
user = get_validated_string_input(
- "Enter user account for ambari-server service
({0}):".format(self.username),
- self.username, None,
+ "Enter user account for ambari-server service ({0}):".format(self.user),
+ self.user, None,
"Invalid username.",
False
)
if user in self.NR_SYSTEM_USERS:
- self.username = user
+ self.user = user
return 0
from ambari_commons.os_windows import UserHelper
@@ -265,7 +265,7 @@ class AmbariUserChecksWindows(AmbariUserChecks):
if user.find('\\') == -1:
user = '.\\' + user
-self.username = user
+self.user = user
return 0
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
ambari git commit: AMBARI-10961. nimbus.host still visible even after adding tag for HDP2.3 stack defintion (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a72e62c79 -> a1effe19f
AMBARI-10961. nimbus.host still visible even after adding tag for
HDP2.3 stack defintion (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1effe19
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1effe19
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1effe19
Branch: refs/heads/trunk
Commit: a1effe19f9dc931b103501df24da4cbd3b339a3d
Parents: a72e62c
Author: Andrew Onishuk
Authored: Wed May 6 18:19:29 2015 +0300
Committer: Andrew Onishuk
Committed: Wed May 6 18:19:29 2015 +0300
--
.../STORM/0.9.1.2.1/configuration/storm-env.xml | 9 ++
.../0.9.1.2.1/package/scripts/params_linux.py | 3 +-
.../services/STORM/configuration/storm-env.xml | 29
.../stacks/2.1/configs/default-storm-start.json | 3 +-
.../test/python/stacks/2.1/configs/default.json | 3 +-
.../stacks/2.1/configs/secured-storm-start.json | 3 +-
.../test/python/stacks/2.1/configs/secured.json | 3 +-
ambari-web/app/data/HDP2.3/site_properties.js | 3 +-
8 files changed, 50 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1effe19/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
index c1850e9..5aadd99 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
@@ -61,4 +61,13 @@ export STORM_LOG_DIR={{log_dir}}
# export STORM_CONF_DIR=""
+
+
+
+ nimbus_seeds_supported
+ false
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1effe19/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index 8bcc84a..6c96d73 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -81,7 +81,8 @@ user_group =
config['configurations']['cluster-env']['user_group']
java64_home = config['hostLevelParams']['java_home']
jps_binary = format("{java64_home}/bin/jps")
nimbus_port = config['configurations']['storm-site']['nimbus.thrift.port']
-nimbus_host = config['configurations']['storm-site']['nimbus.host']
+nimbus_seeds_supported =
config['configurations']['storm-env']['nimbus_seeds_supported']
+nimbus_host = config['configurations']['storm-site']['nimbus.seeds'] if
nimbus_seeds_supported else
config['configurations']['storm-site']['nimbus.host']
rest_api_port = "8745"
rest_api_admin_port = "8746"
rest_api_conf_file = format("{conf_dir}/config.yaml")
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1effe19/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
new file mode 100644
index 000..1d33bd1
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+nimbus_seeds_supported
+true
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1effe19/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
--
diff --git
a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
index d1b59c3..d3cc980 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
@@ -213,7 +213,8 @@
"content": "\n#!/bin/bash\n\n# Set Storm specific environment
variables here.\n\n# The java implementation to use.\nexport
JAVA_HOME={{java64_home}}\n\n# export STORM_CONF_DIR=\"\"",
"storm_log
ambari git commit: AMBARI-10960. Widget layout changes when editing raw value of enhanced-config (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 29e1ad6a1 -> a72e62c79
AMBARI-10960. Widget layout changes when editing raw value of enhanced-config
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a72e62c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a72e62c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a72e62c7
Branch: refs/heads/trunk
Commit: a72e62c79f3e0dfa07005ca9ba5cfe3690647e90
Parents: 29e1ad6
Author: Oleg Nechiporenko
Authored: Wed May 6 18:16:26 2015 +0300
Committer: Oleg Nechiporenko
Committed: Wed May 6 18:18:50 2015 +0300
--
ambari-web/app/styles/widgets.less | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a72e62c7/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less
b/ambari-web/app/styles/widgets.less
index 36f6674..c70e888 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -49,6 +49,7 @@
margin-bottom: 11px;
.widget-config-label {
font-size: 90%;
+width: 100%;
&.text-success {
color: @green;
}
@@ -384,6 +385,7 @@
.checkbox-widget {
.widget-config-label {
margin-left: 10px;
+width: auto;
}
.bootstrap-checkbox {
ambari git commit: AMBARI-9823 - Alert Notifications Are Not Received Without Restarting Ambari Server (part3) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 8872e5581 -> 6df463193
AMBARI-9823 - Alert Notifications Are Not Received Without Restarting Ambari
Server (part3) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6df46319
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6df46319
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6df46319
Branch: refs/heads/branch-2.0.maint
Commit: 6df463193bf9007d2b7c7d8741f8d08e0f4d93ce
Parents: 8872e55
Author: Jonathan Hurley
Authored: Wed May 6 10:57:57 2015 -0400
Committer: Jonathan Hurley
Committed: Wed May 6 10:57:57 2015 -0400
--
.../java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6df46319/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
index d355d3d..85973b1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
@@ -45,6 +45,8 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.NotificationState;
import org.apache.ambari.server.state.Service;
+import org.eclipse.persistence.config.HintValues;
+import org.eclipse.persistence.config.QueryHints;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -301,6 +303,7 @@ public class AlertDispatchDAO {
"AlertGroupEntity.findByAssociatedDefinition", AlertGroupEntity.class);
query.setParameter("alertDefinition", definitionEntity);
+query.setHint(QueryHints.REFRESH, HintValues.TRUE);
return daoUtils.selectList(query);
}
ambari git commit: AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk ef9b2f4a8 -> 29e1ad6a1
AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29e1ad6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29e1ad6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29e1ad6a
Branch: refs/heads/trunk
Commit: 29e1ad6a178ee17757da1b1faf85123bb6200976
Parents: ef9b2f4
Author: Robert Levas
Authored: Wed May 6 11:01:50 2015 -0400
Committer: Robert Levas
Committed: Wed May 6 11:01:50 2015 -0400
--
.../common-services/OOZIE/5.0.0.2.3/alerts.json | 44 +
.../5.0.0.2.3/configuration/oozie-site.xml | 167 +
.../OOZIE/5.0.0.2.3/metainfo.xml| 177 +++
.../2.3.GlusterFS/services/OOZIE/metainfo.xml | 48 +
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 45 +
.../server/stack/KerberosDescriptorTest.java| 9 +-
6 files changed, 400 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/29e1ad6a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
new file mode 100644
index 000..4bfae15
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
@@ -0,0 +1,44 @@
+{
+ "OOZIE": {
+"service": [],
+"OOZIE_SERVER": [
+ {
+"name": "oozie_server_webui",
+"label": "Oozie Server Web UI",
+"description": "This host-level alert is triggered if the Oozie server
Web UI is unreachable.",
+"interval": 1,
+"scope": "ANY",
+"source": {
+ "type": "WEB",
+ "uri": {
+"http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
+"kerberos_keytab":
"{{oozie-site/oozie.authentication.kerberos.keytab}}",
+"kerberos_principal":
"{{oozie-site/oozie.authentication.kerberos.principal}}"
+ },
+ "reporting": {
+"ok": {
+ "text": "HTTP {0} response in {2:.3f}s"
+},
+"warning":{
+ "text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
+},
+"critical": {
+ "text": "Connection failed to {1} ({3})"
+}
+ }
+}
+ },
+ {
+"name": "oozie_server_status",
+"label": "Oozie Server Status",
+"description": "This host-level alert is triggered if the Oozie server
cannot be determined to be up and responding to client requests.",
+"interval": 1,
+"scope": "ANY",
+"source": {
+ "type": "SCRIPT",
+ "path": "OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py"
+}
+ }
+]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/29e1ad6a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
new file mode 100644
index 000..b17e4cd
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+oozie.authentication.kerberos.name.rules
+
+ RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
+ RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
+ RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ DEFAULT
+
+The mapping from kerberos principal names to local OS user
names.
+
+
+
+oozie.authentication.type
+simple
+
+ Authentication used for Oozie HTTP endpoint, the supported values are:
simple | kerberos |
+ #AUTHENTICATION_HANDLER_CLASSNAME#.
+
+
+
+
+oozie.base.url
+http://localhost:11000/oozie
+Base Oozie URL.
+
+
+
+oozie.credentials.credentialclasses
+hcat=org.apache.oozie.action.hadoop.HCatCredentials
+
+ Credential Class to be used for HCat.
+
+
+
+
+oozie.service.AuthorizationService.authorization.enabled
+false
+
+ Specifies whether security (user name/admin role) is enabled or not.
+ If disabled any user can manage Oozie system and manage any job.
+
+
+
+
ambari git commit: AMBARI-10952 Implement a ambari-server property to suppress service checks during deploy cluster. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk dcc3c7ed1 -> ef9b2f4a8
AMBARI-10952 Implement a ambari-server property to suppress service checks
during deploy cluster. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef9b2f4a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef9b2f4a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef9b2f4a
Branch: refs/heads/trunk
Commit: ef9b2f4a807e93aa9a17be783ecbb211bc6fb7e4
Parents: dcc3c7e
Author: Andrii Tkach
Authored: Wed May 6 15:42:32 2015 +0300
Committer: Andrii Tkach
Committed: Wed May 6 17:18:33 2015 +0300
--
.../app/controllers/main/admin/kerberos/step8_controller.js| 3 ++-
ambari-web/app/mixins/wizard/wizardProgressPageController.js | 4 +++-
.../controllers/main/service/reassign/step4_controller_test.js | 6 ++
.../controllers/main/service/reassign/step6_controller_test.js | 6 ++
4 files changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9b2f4a/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
index bffd62c..fee4835 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
@@ -22,6 +22,7 @@ App.KerberosWizardStep8Controller =
App.KerberosProgressPageController.extend({
commands: ['startServices'],
startServices: function () {
+var skipServiceCheck =
App.router.get('clusterController.ambariProperties')['skip.service.checks'] ===
"true";
App.ajax.send({
name: 'common.services.update',
sender: this,
@@ -30,7 +31,7 @@ App.KerberosWizardStep8Controller =
App.KerberosProgressPageController.extend({
"ServiceInfo": {
"state": "STARTED"
},
-urlParams: "params/run_smoke_test=true"
+urlParams: "params/run_smoke_test=" + !skipServiceCheck
},
success: 'startPolling',
error: 'onTaskError'
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9b2f4a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
--
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index d8168a3..28e8f41 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -426,6 +426,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
* @returns {$.ajax}
*/
startServices: function (runSmokeTest, excludedServices) {
+var skipServiceCheck =
App.router.get('clusterController.ambariProperties')['skip.service.checks'] ===
"true";
var data = {
'ServiceInfo': {
'state': 'STARTED'
@@ -443,7 +444,8 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
}
if (runSmokeTest) {
- data.urlParams = data.urlParams ? data.urlParams +
'¶ms/run_smoke_test=true' : 'params/run_smoke_test=true';
+ data.urlParams = data.urlParams ? data.urlParams + '&' : '';
+ data.urlParams += 'params/run_smoke_test=' + !skipServiceCheck;
}
return App.ajax.send({
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9b2f4a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 4b26a87..b23e5d6 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -969,6 +969,12 @@ describe('App.ReassignMasterWizardStep4Controller',
function () {
});
describe('#startServices()', function () {
+before(function () {
+ sinon.stub(App.router, 'get').returns({"skip.service.checks": "false"});
+});
+after(function () {
+ App.router.get.restore();
+});
it('', function () {
controller.startServices();
expect(App.ajax.send.calledOnce).to.be.true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9b2f4a/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js
b/ambari-web/test/controllers/main/s
ambari git commit: AMBARI-10959. Reduce time between ActionScheduler wakeups (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9ee1721f7 -> dcc3c7ed1
AMBARI-10959. Reduce time between ActionScheduler wakeups (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcc3c7ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcc3c7ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcc3c7ed
Branch: refs/heads/trunk
Commit: dcc3c7ed17a68968b116868a9881c347196c3bea
Parents: 9ee1721
Author: Lisnichenko Dmitro
Authored: Wed May 6 17:08:29 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Wed May 6 17:09:00 2015 +0300
--
.../java/org/apache/ambari/server/controller/ControllerModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcc3c7ed/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index e2f6ccb..3994a7b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -303,7 +303,7 @@ public class ControllerModule extends AbstractModule {
bind(Clusters.class).to(ClustersImpl.class);
bind(AmbariCustomCommandExecutionHelper.class);
bind(ActionDBAccessor.class).to(ActionDBAccessorImpl.class);
-bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(1L);
+bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(1000L);
// This time is added to summary timeout time of all tasks in stage
// So it's an "additional time", given to stage to finish execution before
ambari git commit: AMBARI-10957. NFS gateway component should not be checked by default (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 39ab95abc -> 9ee1721f7
AMBARI-10957. NFS gateway component should not be checked by default (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ee1721f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ee1721f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ee1721f
Branch: refs/heads/trunk
Commit: 9ee1721f7d7f1b407ed5acd30fe52068574ae3d8
Parents: 39ab95a
Author: Andrew Onishuk
Authored: Wed May 6 16:31:47 2015 +0300
Committer: Andrew Onishuk
Committed: Wed May 6 16:31:47 2015 +0300
--
.../src/main/resources/stacks/HDP/2.3/services/stack_advisor.py | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ee1721f/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index c3a9945..5a23f24 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -41,3 +41,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
if
services["configurations"]["tez-site"]["properties"]["tez.runtime.sorter.class"]
== "LEGACY":
putTezAttribute = self.putPropertyAttribute(configurations, "tez-site")
putTezAttribute("tez.runtime.io.sort.mb", "maximum", 2047)
+
+ def isComponentUsingCardinalityForLayout(self, componentName):
+return componentName == 'NFS_GATEWAY'
\ No newline at end of file
ambari git commit: AMBARI-10958. Falcon Service Check fails with Unable to initialize Error (aonishuk)
Repository: ambari Updated Branches: refs/heads/trunk 1cde5c70a -> 39ab95abc AMBARI-10958. Falcon Service Check fails with Unable to initialize Error (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/39ab95ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/39ab95ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/39ab95ab Branch: refs/heads/trunk Commit: 39ab95abc4ba3413d80febf38c4283a18d89725a Parents: 1cde5c7 Author: Andrew Onishuk Authored: Wed May 6 16:03:54 2015 +0300 Committer: Andrew Onishuk Committed: Wed May 6 16:03:54 2015 +0300 -- .../0.5.0.2.1/configuration/falcon-startup.properties.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/39ab95ab/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml -- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml index 6a35c17..451ebb5 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml @@ -122,6 +122,12 @@ +*.hive.shared.libs + hive-exec,hive-metastore,hive-common,hive-service,hive-hcatalog-server-extensions,\ +hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client + + + *.entity.topic FALCON.ENTITY.TOPIC
ambari git commit: AMBARI-10956. "Loading latest" log entry should include info about stack and version (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk dff2e0e02 -> 1cde5c70a
AMBARI-10956. "Loading latest" log entry should include info about stack and
version (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cde5c70
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cde5c70
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cde5c70
Branch: refs/heads/trunk
Commit: 1cde5c70a7a101298836955dae85720efafe420e
Parents: dff2e0e
Author: Lisnichenko Dmitro
Authored: Wed May 6 15:58:37 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Wed May 6 15:58:37 2015 +0300
--
.../ambari/server/state/stack/LatestRepoCallable.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cde5c70/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index f4578a6..cd7d229 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -71,7 +71,8 @@ public class LatestRepoCallable implements Callable {
LOOKUP_CONNECTION_TIMEOUT, LOOKUP_READ_TIMEOUT,
null, null, null);
-LOG.info("Loading latest URL info from " + sourceUri);
+LOG.info("Loading latest URL info for stack " + stack.getName() + "-" +
+stack.getVersion() + " from " + sourceUri);
latestUrlMap = gson.fromJson(new InputStreamReader(
streamProvider.readFrom(sourceUri)), type);
} else {
@@ -83,12 +84,14 @@ public class LatestRepoCallable implements Callable {
}
if (jsonFile.exists()) {
- LOG.info("Loading latest URL info from " + jsonFile);
+ LOG.info("Loading latest URL info for stack " + stack.getName() +
"-" +
+ stack.getVersion() + " from " + jsonFile);
latestUrlMap = gson.fromJson(new FileReader(jsonFile), type);
}
}
} catch (Exception e) {
- LOG.error("Could not load the URI " + sourceUri + " (" + e.getMessage()
+ ")");
+ LOG.error("Could not load the URI for stack " + stack.getName() + "-" +
+ stack.getVersion() + " from " + sourceUri + " (" +
e.getMessage() + ")");
throw e;
}
ambari git commit: AMBARI-10951 Misc ui tweaks for template widget type. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 4dac157e9 -> dff2e0e02
AMBARI-10951 Misc ui tweaks for template widget type. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dff2e0e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dff2e0e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dff2e0e0
Branch: refs/heads/trunk
Commit: dff2e0e026eb56366c7b6009175a7c4bc70916c9
Parents: 4dac157
Author: Andrii Tkach
Authored: Wed May 6 13:24:30 2015 +0300
Committer: Andrii Tkach
Committed: Wed May 6 15:41:55 2015 +0300
--
.../HBASE/Append_num_ops_&_Delete_num_ops.json | 4 +
ambari-web/app/assets/test/tests.js | 1 +
.../service/widgets/create/step2_controller.js | 12 +-
.../app/mixins/common/widgets/widget_mixin.js | 22 +-
ambari-web/app/models/widget.js | 9 +-
.../templates/common/widget/template_widget.hbs | 2 +-
.../views/common/widget/number_widget_view.js | 9 +-
.../views/common/widget/template_widget_view.js | 7 +
.../widgets/create/step2_controller_test.js | 278 +++
.../test/mixins/common/widget_mixin_test.js | 10 +-
10 files changed, 329 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dff2e0e0/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
--
diff --git
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
index f9ca4c7..0342e0f 100644
---
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
+++
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
@@ -6,6 +6,10 @@
"service_name" : "HBASE"
},
"metrics" : {
+"network": {
+ "bytes_in": 7.698,
+ "bytes_out": 2.23342
+},
"jvm": {
"HeapMemoryUsed": 61,
"HeapMemoryMax": 100
http://git-wip-us.apache.org/repos/asf/ambari/blob/dff2e0e0/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 44d6d80..eed4cc7 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -88,6 +88,7 @@ var files = ['test/init_model_test',
'test/controllers/main/service/reassign/step6_controller_test',
'test/controllers/main/service/reassign/step7_controller_test',
'test/controllers/main/service/widgets/create/step1_controller_test',
+ 'test/controllers/main/service/widgets/create/step2_controller_test',
'test/controllers/main/dashboard_test',
'test/controllers/main/host_test',
'test/controllers/main/service/item_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/dff2e0e0/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js
b/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js
index d6b6cd9..8dddb08 100644
--- a/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js
@@ -126,7 +126,7 @@ App.WidgetWizardStep2Controller = Em.Controller.extend({
* @returns {boolean}
*/
isExpressionComplete: function (expression) {
-return expression && !expression.get('isInvalid') &&
!expression.get('isEmpty');
+return Boolean(expression && !expression.get('isInvalid') &&
!expression.get('isEmpty'));
},
/**
@@ -155,10 +155,12 @@ App.WidgetWizardStep2Controller = Em.Controller.extend({
isTemplateDataComplete: function (expressions, templateValue) {
var isComplete = Boolean(expressions.length > 0 && templateValue.trim()
!== '');
-for (var i = 0; i < expressions.length; i++) {
- if (!this.isExpressionComplete(expressions[i])) {
-isComplete = false;
-break;
+if (isComplete) {
+ for (var i = 0; i < expressions.length; i++) {
+if (!this.isExpressionComplete(expressions[i])) {
+ isComplete = false;
+ break;
+}
}
}
return isComplete;
http://git-wip-us.apache.org/repos/asf/ambari/blob/dff2e0e0/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index 6d1e0dd..4acf838 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
[1/3] ambari git commit: AMBARI-10953. Hive Server 2 Process Check Should Always Use Beeline Instead of TCP Sockets (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk a5d0caf32 -> 4dac157e9
AMBARI-10953. Hive Server 2 Process Check Should Always Use Beeline Instead of
TCP Sockets (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ccd0c44b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ccd0c44b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ccd0c44b
Branch: refs/heads/trunk
Commit: ccd0c44b64e6768f5fab3a2d349ba365f9af6b34
Parents: a5d0caf
Author: Lisnichenko Dmitro
Authored: Wed May 6 15:05:01 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Wed May 6 15:05:01 2015 +0300
--
.../libraries/functions/hive_check.py | 64
.../package/alerts/alert_hive_thrift_port.py| 33 +++---
.../0.12.0.2.0/package/scripts/hive_service.py | 18 +++---
.../0.12.0.2.0/package/scripts/params_linux.py | 6 ++
.../0.12.0.2.0/package/scripts/service_check.py | 4 +-
.../stacks/2.0.6/HIVE/test_hive_server.py | 48 ---
.../2.0.6/HIVE/test_hive_service_check.py | 8 ++-
7 files changed, 112 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd0c44b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
index f0036be..6bd6599 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -22,35 +22,47 @@ from resource_management.core.resources import Execute
from resource_management.libraries.functions import format
import socket
-def check_thrift_port_sasl(address, port, hive_auth = "NOSASL", key = None,
kinitcmd = None, smokeuser = 'ambari-qa',
- transport_mode = "binary"):
+
+def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None,
kinitcmd=None, smokeuser='ambari-qa',
+ transport_mode="binary",
http_endpoint="cliservice", ssl=False, ssl_keystore=None,
+ ssl_password=None):
"""
Hive thrift SASL port check
"""
- BEELINE_CHECK_TIMEOUT = 30
+ # check params to be correctly passed, if not - try to cast them
+ if isinstance(port, str):
+port = int(port)
+
+ if isinstance(ssl, str):
+ssl = bool(ssl)
+
+ # to pass as beeline argument
+ ssl_str = str(ssl).lower()
+ beeline_check_timeout = 30
+ beeline_url = ['jdbc:hive2://{address}:{port}/',
"transportMode={transport_mode}"]
+
+ # append url according to used transport
+ if transport_mode == "http":
+beeline_url.append('httpPath={http_endpoint}')
+
+ # append url according to used auth
+ if hive_auth == "NOSASL":
+beeline_url.append('auth=noSasl')
+
+ # append url according to ssl configuration
+ if ssl and ssl_keystore is not None and ssl_password is not None:
+beeline_url.extend(['ssl={ssl_str}', 'sslTrustStore={ssl_keystore}',
'trustStorePassword={ssl_password!p}'])
+
+ # append url according to kerberos setting
if kinitcmd:
-url = format("jdbc:hive2://{address}:{port}/;principal={key}")
-Execute(kinitcmd,
-user=smokeuser
-)
- else:
-url = format("jdbc:hive2://{address}:{port}")
-
- if hive_auth != "NOSASL" and transport_mode != "http":
-cmd = format("! beeline -u '{url}' -e '' ") + "2>&1| awk '{print}'|grep -i
-e 'Connection refused' -e 'Invalid URL'"
-Execute(cmd,
-user=smokeuser,
-path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
-timeout=BEELINE_CHECK_TIMEOUT
-)
- else:
-s = socket.socket()
-s.settimeout(1)
-try:
- s.connect((address, port))
-except socket.error, e:
- raise
-finally:
- s.close()
+beeline_url.append('principal={key}')
+Execute(kinitcmd, user=smokeuser)
+ cmd = "! beeline -u '%s' -e '' 2>&1| awk '{print}'|grep -i -e 'Connection
refused' -e 'Invalid URL'" % \
+format(";".join(beeline_url))
+ Execute(cmd,
+ user=smokeuser,
+ path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
+ timeout=beeline_check_timeout
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd0c44b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
b/ambari-server/src/m
[3/3] ambari git commit: AMBARI-10955. Remove element from gluster 2.1 and 2.2 stack defs (dlysnichenko)
AMBARI-10955. Remove element from gluster 2.1 and 2.2 stack defs (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4dac157e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4dac157e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4dac157e Branch: refs/heads/trunk Commit: 4dac157e9be719ae473046409f1d9ff20b13ac91 Parents: 24726e9 Author: Lisnichenko Dmitro Authored: Wed May 6 15:06:21 2015 +0300 Committer: Lisnichenko Dmitro Committed: Wed May 6 15:06:21 2015 +0300 -- .../main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml| 3 +-- .../main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml| 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac157e/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml index 216e41d..cfee6f5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/repos/repoinfo.xml @@ -16,8 +16,7 @@ limitations under the License. --> - - http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac157e/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml index 7acb8b9..66897d5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml @@ -16,7 +16,7 @@ limitations under the License. --> - http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0
[2/3] ambari git commit: AMBARI-10954. Configs: HBase logging is set to DEBUG by default (dlysnichenko)
AMBARI-10954. Configs: HBase logging is set to DEBUG by default (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24726e90
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24726e90
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24726e90
Branch: refs/heads/trunk
Commit: 24726e90e55f1c936bc9240e4373dde350fecd49
Parents: ccd0c44
Author: Lisnichenko Dmitro
Authored: Wed May 6 15:05:39 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Wed May 6 15:05:39 2015 +0300
--
.../common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/24726e90/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
index 57b3845..64cc9d3 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
@@ -119,7 +119,7 @@ log4j.appender.console.layout.ConversionPattern=%d{ISO8601}
%-5p [%t] %c{2}: %m%
log4j.logger.org.apache.zookeeper=INFO
#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-log4j.logger.org.apache.hadoop.hbase=DEBUG
+log4j.logger.org.apache.hadoop.hbase=INFO
# Make these two classes INFO-level. Make them DEBUG to see more zk debug.
log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=INFO
log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
ambari git commit: Revert "AMBARI-10662. RU: Add manual step with message for skipped services (dlysnichenko)"
Repository: ambari Updated Branches: refs/heads/trunk 373427ff3 -> a5d0caf32 Revert "AMBARI-10662. RU: Add manual step with message for skipped services (dlysnichenko)" This reverts commit ff90c33ba6e6b2f0df21e6932b6a4b0a2caa2007. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a5d0caf3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a5d0caf3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a5d0caf3 Branch: refs/heads/trunk Commit: a5d0caf3255487e90b61089bf9a7ebd304e98981 Parents: 373427f Author: Lisnichenko Dmitro Authored: Wed May 6 14:39:55 2015 +0300 Committer: Lisnichenko Dmitro Committed: Wed May 6 14:39:55 2015 +0300 -- .../resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 10 -- .../resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 10 -- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 10 -- 3 files changed, 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a5d0caf3/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml index ad3e805..0cf8ff2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml @@ -169,16 +169,6 @@ - - true - -UPGRADE - - Please confirm skipped services. - - - - false http://git-wip-us.apache.org/repos/asf/ambari/blob/a5d0caf3/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index d45458f..8dccf65 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -169,16 +169,6 @@ - - true - -UPGRADE - - Please confirm skipped services. - - - - false http://git-wip-us.apache.org/repos/asf/ambari/blob/a5d0caf3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index 941072b..65549dd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -169,16 +169,6 @@ - - true - -UPGRADE - - Please confirm skipped services. - - - - false
ambari git commit: AMBARI-10950. Configs: UI is shifting. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 28a88d3f5 -> 373427ff3
AMBARI-10950. Configs: UI is shifting. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/373427ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/373427ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/373427ff
Branch: refs/heads/trunk
Commit: 373427ff3b40b0b777bd533906e3a4e8e379f707
Parents: 28a88d3
Author: Oleg Nechiporenko
Authored: Wed May 6 12:38:13 2015 +0300
Committer: Oleg Nechiporenko
Committed: Wed May 6 12:38:13 2015 +0300
--
ambari-web/app/styles/application.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/373427ff/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index c10ef22..95824fb 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5359,7 +5359,7 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
margin-top: @space-m;
}
-.mbm { margin-bottom: @space-m; margin-top: -55px; }
+.mbm { margin-bottom: @space-m * 2; margin-top: -55px; }
.mll {
margin-left: @space-l;
ambari git commit: AMBARI-10949. Hcat install task fails on a secure cluster (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk aa477d93c -> 28a88d3f5
AMBARI-10949. Hcat install task fails on a secure cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28a88d3f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28a88d3f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28a88d3f
Branch: refs/heads/trunk
Commit: 28a88d3f51d0ed70552d7008b28937f1483c8aa9
Parents: aa477d9
Author: Andrew Onishuk
Authored: Wed May 6 12:03:26 2015 +0300
Committer: Andrew Onishuk
Committed: Wed May 6 12:03:26 2015 +0300
--
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/28a88d3f/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 38bdced..8af69d7 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -362,6 +362,9 @@ ranger_env = config['configurations']['ranger-env']
ranger_plugin_properties =
config['configurations']['ranger-hive-plugin-properties']
policy_user =
config['configurations']['ranger-hive-plugin-properties']['policy_user']
+if security_enabled:
+ hive_principal = hive_server_principal.replace('_HOST',hostname.lower())
+
#For curl command in ranger plugin to get db connector
if has_ranger_admin:
if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
@@ -398,6 +401,3 @@ if has_ranger_admin:
'repositoryType': 'hive',
'assetType': '3'
}
-
-if security_enabled:
- hive_principal = hive_server_principal.replace('_HOST',hostname.lower())
