Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2dcd409
Better behaviour in the presence of backing off
j-baker Aug 2, 2018
c583b33
Merge branch 'develop' into jbaker/better_429_behaviour
j-baker Aug 2, 2018
d51d3ac
more docs, easier to read
j-baker Aug 2, 2018
19a8173
Better concurrency limiters
j-baker Aug 3, 2018
d7164de
fixes
j-baker Aug 3, 2018
39388b7
simplify
j-baker Aug 3, 2018
f2927d0
Checkstyle
j-baker Aug 13, 2018
8f57de6
checkstyle
j-baker Aug 13, 2018
8f02b8b
PR comments
j-baker Sep 2, 2018
fbbcc41
Tweak the concurrency limiters lib
j-baker Sep 2, 2018
27a2153
reset flow control test
j-baker Sep 2, 2018
e548996
changes
j-baker Sep 2, 2018
a4c9e68
Changes
j-baker Sep 2, 2018
c68bc89
Passes the build
j-baker Sep 2, 2018
91dd6d2
update lockfiles
j-baker Sep 2, 2018
2229a81
Merge remote-tracking branch 'origin/develop' into jbaker/better_429_…
j-baker Sep 11, 2018
ee8e539
New attempt using interceptor
j-baker Sep 11, 2018
036d45b
more comments
j-baker Sep 11, 2018
1e18435
some bullshit
j-baker Sep 12, 2018
fbdeab1
Perfect
j-baker Sep 12, 2018
951dfdd
cleanup
j-baker Sep 12, 2018
ed18c48
Ready to go?
j-baker Sep 13, 2018
fda4d64
docs
j-baker Sep 13, 2018
8a088d7
Checkstyle
j-baker Sep 13, 2018
a9721e4
chekcstyle
j-baker Sep 13, 2018
1ce7b82
Metric
j-baker Sep 13, 2018
bc38b76
Javadoc
iamdanfox Sep 13, 2018
addbdca
README describes new flow control
iamdanfox Sep 13, 2018
c97925a
Move docs -> class level javadoc
iamdanfox Sep 13, 2018
baaa142
Rename ConcurrencyLimiters#limiter -> acquireLimiter
iamdanfox Sep 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move docs -> class level javadoc
  • Loading branch information
iamdanfox committed Sep 13, 2018
commit c97925a018bd06cefc8e527bc976a79f75e18085
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
* 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.
*
* Changes made:
*
* 1. Package was changed.
* 2. Fields made private.
* 3. Fixed a typo.
*/
package com.palantir.remoting3.okhttp;

Expand All @@ -28,7 +22,11 @@
/**
* Class used to track immutable samples in an AtomicReference.
*
* See {@link com.netflix.concurrency.limits.limit.ImmutableSampleWindow}
* Changes made to {@link com.netflix.concurrency.limits.limit.ImmutableSampleWindow}
*
* 1. Package was changed.
* 2. Fields made private.
* 3. Fixed a typo (getAverateRttNanos -> getAverageRttNanos)
*/
final class ImmutableSampleWindow {
private final long minRtt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
* 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.
*
* This limiter has been forked from Netflix's implementation. Changes are:
* 1. Palantir license.
* 2. Codestyle.
* 3. Made package private.
* 4. Modified to support a 'timeout', rather than blocking forever.
* 5. Renamed to RemotingBlockingLimiter and changed package in order to avoid ambiguity.
*/
package com.palantir.remoting3.okhttp;

Expand All @@ -34,6 +27,15 @@
* {@link Limiter} that blocks the caller when the limit has been reached. The caller is
* blocked until the limiter has been released. This limiter is commonly used in batch
* clients that use the limiter as a back-pressure mechanism.
*
* This limiter has been forked from Netflix's {@link com.netflix.concurrency.limits.limiter.BlockingLimiter}.
*
* Changes are:
* 1. Modified to support a 'timeout', rather than blocking forever.
* 2. Codestyle.
* 3. Made package private.
* 4. Palantir license.
* 5. Renamed to RemotingBlockingLimiter and changed package in order to avoid ambiguity.
* <p>
* TODO(j-baker): Remove once https://github.com/Netflix/concurrency-limits/pull/78 is merged and released.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
* 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.
*
* Changes made from WindowedLimit:
*
* 1. Change package and make package private.
* 2. Code style.
* 3. Modify to reduce window size whenever a dropped sample is seen, rather than awaiting the whole window.
* 4. Inlined constants.
*/
package com.palantir.remoting3.okhttp;

Expand All @@ -29,6 +22,14 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;

/**
* Changes made from {@link com.netflix.concurrency.limits.limit.WindowedLimit}:
*
* 1. Modify to reduce window size whenever a dropped sample is seen, rather than awaiting the whole window.
* 2. Change package and make package private.
* 3. Code style.
* 4. Inlined constants.
*/
class RemotingWindowedLimit implements Limit {
private static final long MIN_WINDOW_TIME = TimeUnit.SECONDS.toNanos(1);
private static final long MAX_WINDOW_TIME = TimeUnit.SECONDS.toNanos(1);
Expand Down