Repository: incubator-atlas Updated Branches: refs/heads/master f8748ccec -> 5c16d42a0
ATLAS-602 Hooks stuck in case of failure (svimal2106 via shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/5c16d42a Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/5c16d42a Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/5c16d42a Branch: refs/heads/master Commit: 5c16d42a014426a926250aafc0987d3413933839 Parents: f8748cc Author: Shwetha GS <[email protected]> Authored: Wed May 4 12:25:24 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Wed May 4 12:25:24 2016 +0530 ---------------------------------------------------------------------- .../java/org/apache/atlas/hook/AtlasHook.java | 1 + .../org/apache/atlas/hook/AtlasHookTest.java | 44 ++++++++++++++++++++ release-log.txt | 1 + 3 files changed, 46 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5c16d42a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java index 68a868f..c58aafc 100644 --- a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java +++ b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java @@ -103,6 +103,7 @@ public abstract class AtlasHook { } else { LOG.error("Failed to notify atlas for entity {} after {} retries. Quitting", message, maxRetries, e); + return; } } } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5c16d42a/notification/src/test/java/org/apache/atlas/hook/AtlasHookTest.java ---------------------------------------------------------------------- diff --git a/notification/src/test/java/org/apache/atlas/hook/AtlasHookTest.java b/notification/src/test/java/org/apache/atlas/hook/AtlasHookTest.java new file mode 100644 index 0000000..16cb0f0 --- /dev/null +++ b/notification/src/test/java/org/apache/atlas/hook/AtlasHookTest.java @@ -0,0 +1,44 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.atlas.hook; + +import org.apache.atlas.notification.NotificationException; +import org.apache.atlas.notification.NotificationInterface; +import org.apache.atlas.notification.hook.HookNotification; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; + + +public class AtlasHookTest { + @Test + public void testnotifyEntities() throws Exception{ + List<HookNotification.HookNotificationMessage> hookNotificationMessages = new ArrayList<>(); + NotificationInterface notifInterface = mock(NotificationInterface.class); + doThrow(new NotificationException(new Exception())).when(notifInterface) + .send(NotificationInterface.NotificationType.HOOK, hookNotificationMessages); + AtlasHook.notifInterface = notifInterface; + AtlasHook.notifyEntities(hookNotificationMessages, 2); + System.out.println("AtlasHook.notifyEntities() returns successfully"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5c16d42a/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index da3e6d2..92a3e32 100644 --- a/release-log.txt +++ b/release-log.txt @@ -18,6 +18,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-602 Hooks stuck in case of failure (svimal2106 via shwethags) ATLAS-631 Introduce Versioning to Atlas Notification Payload (tbeerbower via shwethags) ATLAS-723 JSON deserialization regression (guptaneeru via shwethags) ATLAS-728 Fix few typos in committer email IDs (yhemanth)
