Return-Path: X-Original-To: apmail-flink-issues-archive@minotaur.apache.org Delivered-To: apmail-flink-issues-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2F6A918147 for ; Mon, 24 Aug 2015 13:17:55 +0000 (UTC) Received: (qmail 55814 invoked by uid 500); 24 Aug 2015 13:17:54 -0000 Delivered-To: apmail-flink-issues-archive@flink.apache.org Received: (qmail 55775 invoked by uid 500); 24 Aug 2015 13:17:54 -0000 Mailing-List: contact issues-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list issues@flink.apache.org Received: (qmail 55766 invoked by uid 99); 24 Aug 2015 13:17:54 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Aug 2015 13:17:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 6F6E7C082C for ; Mon, 24 Aug 2015 13:17:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.025 X-Spam-Level: X-Spam-Status: No, score=-0.025 tagged_above=-999 required=6.31 tests=[RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id p0A5clOqI4bv for ; Mon, 24 Aug 2015 13:17:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id AEAD825D01 for ; Mon, 24 Aug 2015 13:17:40 +0000 (UTC) Received: (qmail 55234 invoked by uid 99); 24 Aug 2015 13:17:39 -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; Mon, 24 Aug 2015 13:17:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4BBEE060C; Mon, 24 Aug 2015 13:17:39 +0000 (UTC) From: mxm To: issues@flink.incubator.apache.org Reply-To: issues@flink.incubator.apache.org References: In-Reply-To: Subject: [GitHub] flink pull request: [FLINK-2490][FIX]Remove the retryForever check... Content-Type: text/plain Message-Id: <20150824131739.C4BBEE060C@git1-us-west.apache.org> Date: Mon, 24 Aug 2015 13:17:39 +0000 (UTC) Github user mxm commented on a diff in the pull request: https://github.com/apache/flink/pull/992#discussion_r37749287 --- Diff: flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunctionTest.java --- @@ -0,0 +1,176 @@ +/* + * 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.flink.streaming.api.functions.source; + +import java.net.Socket; + +import org.apache.flink.configuration.Configuration; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.junit.Test; + +import static java.lang.Thread.sleep; +import static org.junit.Assert.*; + +import java.net.ServerSocket; +import java.util.concurrent.atomic.AtomicReference; + +/** + * Tests for the {@link org.apache.flink.streaming.api.functions.source.SocketTextStreamFunction}. + */ +public class SocketTextStreamFunctionTest{ + + final AtomicReference error = new AtomicReference(); + private final String host = "127.0.0.1"; + + SourceFunction.SourceContext ctx = new SourceFunction.SourceContext() { + public String result; + + @Override + public void collect(String element) { + result = element; + } + + @Override + public String toString() { + return this.result; + } + + @Override + public void collectWithTimestamp(String element, long timestamp) { + + } + + @Override + public void emitWatermark(Watermark mark) { + + } + + @Override + public Object getCheckpointLock() { + return null; + } + + @Override + public void close() { + + } + }; + + public SocketTextStreamFunctionTest() { + } + + class SocketSource extends Thread { + + SocketTextStreamFunction socketSource; + + public SocketSource(ServerSocket serverSo, int maxRetry) { + this.socketSource = new SocketTextStreamFunction(host, serverSo.getLocalPort(), '\n', maxRetry); + } + + public void run() { + try { + this.socketSource.open(new Configuration()); + this.socketSource.run(ctx); + }catch(Exception e){ + error.set(e); + } + } + + public void cancel(){ + this.socketSource.cancel(); + } + } + + @Test + public void testSocketSourceRetryForever() throws Exception{ + ServerSocket serverSo = new ServerSocket(0); + SocketSource source = new SocketSource(serverSo, -1); + source.start(); + + int count = 0; + Socket channel; + while (count < 100) { + channel = serverSo.accept(); + count++; + channel.close(); + } + sleep(10000); + source.cancel(); + + if (error.get() != null) { + Throwable t = error.get(); + t.printStackTrace(); + fail("Error in spawned thread: " + t.getMessage()); + } + + assertEquals(100, count); + } + + @Test + public void testSocketSourceRetryTenTimes() throws Exception{ + ServerSocket serverSo = new ServerSocket(0); + SocketSource source = new SocketSource(serverSo, 10); + + assertEquals(0, source.socketSource.retries); + + source.start(); + + Socket channel; + channel = serverSo.accept(); + channel.close(); + serverSo.close(); + while(source.socketSource.retries < 10){ + long lastRetry = source.socketSource.retries; + sleep(10000); + assertTrue(source.socketSource.retries > lastRetry); --- End diff -- Could you change this to `assertEquals(lastRetry+1, source.socketSource.retries)`? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---