Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 141B7200C22 for ; Tue, 21 Feb 2017 19:11:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1296D160B68; Tue, 21 Feb 2017 18:11:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 335C4160B4F for ; Tue, 21 Feb 2017 19:11:45 +0100 (CET) Received: (qmail 5900 invoked by uid 500); 21 Feb 2017 18:11:44 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 5891 invoked by uid 99); 21 Feb 2017 18:11:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2017 18:11:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49ED9DFADC; Tue, 21 Feb 2017 18:11:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jstewart@apache.org To: commits@geode.apache.org Message-Id: <7b23220d038e4e14963faf4384387572@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-2416: ExportLogDUnit improvements Date: Tue, 21 Feb 2017 18:11:44 +0000 (UTC) archived-at: Tue, 21 Feb 2017 18:11:46 -0000 Repository: geode Updated Branches: refs/heads/feature/GEODE-2267 6c141f9e1 -> 450516464 GEODE-2416: ExportLogDUnit improvements Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/45051646 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/45051646 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/45051646 Branch: refs/heads/feature/GEODE-2267 Commit: 450516464673d0fcf0460e6db107b566b5ffb5d6 Parents: 6c141f9 Author: Jared Stewart Authored: Tue Feb 21 10:10:27 2017 -0800 Committer: Jared Stewart Committed: Tue Feb 21 10:10:27 2017 -0800 ---------------------------------------------------------------------- .../internal/cli/commands/ExportLogsDUnit.java | 72 +++++++++++++++----- 1 file changed, 56 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/45051646/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnit.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnit.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnit.java index a405d0d..43ee742 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnit.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnit.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.commons.io.FileUtils; import org.apache.geode.cache.Cache; -import org.apache.geode.cache.Region; import org.apache.geode.distributed.ConfigurationProperties; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.logging.LogService; @@ -53,12 +52,12 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Properties; import java.util.Set; -import java.util.UUID; import java.util.stream.Stream; @@ -75,7 +74,7 @@ public class ExportLogsDUnit { private Server server1; private Server server2; - private Map> defaultExpectedMessages; + private Map> expectedMessages; @Before public void setup() throws Exception { @@ -88,14 +87,14 @@ public class ExportLogsDUnit { IgnoredException.addIgnoredException(ERROR_LOG_PREFIX); - defaultExpectedMessages = new HashMap<>(); - defaultExpectedMessages.put(locator, listOfLogLines(locator, "info", "error", "debug")); - defaultExpectedMessages.put(server1, listOfLogLines(server1, "info", "error", "debug")); - defaultExpectedMessages.put(server2, listOfLogLines(server2, "info", "error", "debug")); + expectedMessages = new HashMap<>(); + expectedMessages.put(locator, listOfLogLines(locator, "info", "error", "debug")); + expectedMessages.put(server1, listOfLogLines(server1, "info", "error", "debug")); + expectedMessages.put(server2, listOfLogLines(server2, "info", "error", "debug")); // log the messages in each of the members - for (Member member : defaultExpectedMessages.keySet()) { - List logLines = defaultExpectedMessages.get(member); + for (Member member : expectedMessages.keySet()) { + List logLines = expectedMessages.get(member); member.invoke(() -> { Logger logger = LogService.getLogger(); @@ -107,7 +106,47 @@ public class ExportLogsDUnit { } @Test - public void testExportWithStartDateFiltering() throws Exception { + public void startAndEndDateCanExcludeLogs() throws Exception { + ZonedDateTime now = LocalDateTime.now().atZone(ZoneId.systemDefault()); + ZonedDateTime yesterday = now.minusDays(1); + ZonedDateTime twoDaysAgo = now.minusDays(2); + + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(ONLY_DATE_FORMAT); + + CommandStringBuilder commandStringBuilder = new CommandStringBuilder("export logs"); + commandStringBuilder.addOption("start-time", dateTimeFormatter.format(twoDaysAgo)); + commandStringBuilder.addOption("end-time", dateTimeFormatter.format(yesterday)); + commandStringBuilder.addOption("log-level", "debug"); + commandStringBuilder.addOption("dir", "someDir"); + + gfshConnector.executeAndVerifyCommand(commandStringBuilder.toString()); + + Set acceptedLogLevels = new HashSet<>(); + verifyZipFileContents(acceptedLogLevels); + } + + @Test + public void startAndEndDateCanIncludeLogs() throws Exception { + ZonedDateTime now = LocalDateTime.now().atZone(ZoneId.systemDefault()); + ZonedDateTime yesterday = now.minusDays(1); + ZonedDateTime tomorrow = now.plusDays(1); + + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(ONLY_DATE_FORMAT); + + CommandStringBuilder commandStringBuilder = new CommandStringBuilder("export logs"); + commandStringBuilder.addOption("start-time", dateTimeFormatter.format(yesterday)); + commandStringBuilder.addOption("end-time", dateTimeFormatter.format(tomorrow)); + commandStringBuilder.addOption("log-level", "debug"); + commandStringBuilder.addOption("dir", "someDir"); + + gfshConnector.executeAndVerifyCommand(commandStringBuilder.toString()); + + Set acceptedLogLevels = Stream.of("info", "error", "debug").collect(toSet()); + verifyZipFileContents(acceptedLogLevels); + } + + @Test + public void testExportWithStartAndEndDateTimeFiltering() throws Exception { ZonedDateTime cutoffTime = LocalDateTime.now().atZone(ZoneId.systemDefault()); String messageAfterCutoffTime = "[this message should not show up since it is after cutoffTime]"; @@ -121,13 +160,14 @@ public class ExportLogsDUnit { String cutoffTimeString = dateTimeFormatter.format(cutoffTime); CommandStringBuilder commandStringBuilder = new CommandStringBuilder("export logs"); + commandStringBuilder.addOption("start-time", dateTimeFormatter.format(cutoffTime.minusHours(1))); commandStringBuilder.addOption("end-time", cutoffTimeString); commandStringBuilder.addOption("log-level", "debug"); commandStringBuilder.addOption("dir", "someDir"); gfshConnector.executeAndVerifyCommand(commandStringBuilder.toString()); - defaultExpectedMessages.get(server1).add(logLineAfterCutoffTime); + expectedMessages.get(server1).add(logLineAfterCutoffTime); Set acceptedLogLevels = Stream.of("info", "error", "debug").collect(toSet()); verifyZipFileContents(acceptedLogLevels); } @@ -170,7 +210,7 @@ public class ExportLogsDUnit { } @Test -public void regionBehavesProperly() throws IOException, ClassNotFoundException { +public void exportLogsRegionIsCleanedUpProperly() throws IOException, ClassNotFoundException { locator.invoke(() -> { ExportLogsFunction.createOrGetExistingExportLogsRegion(true); Cache cache = GemFireCacheImpl.getInstance(); @@ -203,10 +243,10 @@ public void regionBehavesProperly() throws IOException, ClassNotFoundException { Set dirsFromZipFile = Stream.of(unzippedLogFileDir.listFiles()).filter(File::isDirectory).collect(toSet()); - assertThat(dirsFromZipFile).hasSize(defaultExpectedMessages.keySet().size()); + assertThat(dirsFromZipFile).hasSize(expectedMessages.keySet().size()); Set expectedDirNames = - defaultExpectedMessages.keySet().stream().map(Member::getName).collect(toSet()); + expectedMessages.keySet().stream().map(Member::getName).collect(toSet()); Set actualDirNames = dirsFromZipFile.stream().map(File::getName).collect(toSet()); assertThat(actualDirNames).isEqualTo(expectedDirNames); @@ -220,7 +260,7 @@ public void regionBehavesProperly() throws IOException, ClassNotFoundException { throws IOException { String memberName = dirForMember.getName(); - Member member = defaultExpectedMessages.keySet().stream() + Member member = expectedMessages.keySet().stream() .filter((Member aMember) -> aMember.getName().equals(memberName)) .findFirst() .get(); @@ -240,7 +280,7 @@ public void regionBehavesProperly() throws IOException, ClassNotFoundException { FileUtils.readLines(logFileForMember, Charset.defaultCharset()).stream() .collect(joining("\n")); - for (LogLine logLine : defaultExpectedMessages.get(member)) { + for (LogLine logLine : expectedMessages.get(member)) { boolean shouldExpectLogLine = acceptedLogLevels.contains(logLine.level) && !logLine.shouldBeIgnoredDueToTimestamp; if (shouldExpectLogLine) {