storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [26/50] git commit: Merge branch 'storm-backoff-retry-strategy' of github.com:kishorvpatil/incubator-storm
Date Wed, 24 Sep 2014 17:56:53 GMT
Merge branch 'storm-backoff-retry-strategy' of github.com:kishorvpatil/incubator-storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4e692e03
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4e692e03
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4e692e03

Branch: refs/heads/security
Commit: 4e692e0349bc3f62df4453385180f5952c8e4b45
Parents: 445cc82 24749f1
Author: P. Taylor Goetz <ptgoetz@gmail.com>
Authored: Fri Aug 29 15:55:32 2014 -0400
Committer: P. Taylor Goetz <ptgoetz@gmail.com>
Committed: Fri Aug 29 15:55:32 2014 -0400

----------------------------------------------------------------------
 .../backtype/storm/messaging/netty/Client.java  |  27 ++---
 .../StormBoundedExponentialBackoffRetry.java    |  74 ++++++++++++++
 .../src/jvm/backtype/storm/utils/Utils.java     |  30 +-----
 .../test/clj/backtype/storm/utils_test.clj      |   3 +-
 ...StormBoundedExponentialBackoffRetryTest.java | 101 +++++++++++++++++++
 5 files changed, 187 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/4e692e03/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/utils/Utils.java
index a657d2b,77580c4..0e44479
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@@ -37,20 -38,14 +37,19 @@@ import java.util.HashSet
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
 -import java.util.Scanner;
  import java.util.TreeMap;
  import java.util.UUID;
 +import java.util.zip.GZIPOutputStream;
 +import java.util.zip.GZIPInputStream;
  
 +import backtype.storm.serialization.DefaultSerializationDelegate;
 +import backtype.storm.serialization.SerializationDelegate;
  import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.framework.CuratorFrameworkFactory;
- import org.apache.curator.retry.ExponentialBackoffRetry;
  import org.apache.commons.lang.StringUtils;
  import org.apache.thrift.TException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  import org.json.simple.JSONValue;
  import org.yaml.snakeyaml.Yaml;
  import org.yaml.snakeyaml.constructor.SafeConstructor;


Mime
View raw message