Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/src/jmh/java/io/grpc/CallOptionsBenchmark.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public CallOptions withOption() {
}

/**
* Adding custom call options, overwritting existing keys.
* Adding custom call options, overwriting existing keys.
*/
@Benchmark
@BenchmarkMode(Mode.SampleTime)
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/io/grpc/StatusOr.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public Status getStatus() {
}

/**
* Note that StatusOr containing statuses, the equality comparision is delegated to
* Note that StatusOr containing statuses, the equality comparison is delegated to
* {@link Status#equals} which just does a reference equality check because equality on
* Statuses is not well defined.
* Instead, do comparison based on their Code with {@link Status#getCode}. The description and
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/java/io/grpc/SynchronizationContextTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,12 @@ static class MockScheduledExecutorService extends ForwardingScheduledExecutorSer
return future = super.schedule(command, delay, unit);
}

@Override public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long intialDelay,
@Override public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay,
long delay, TimeUnit unit) {
this.command = command;
this.delay = delay;
this.unit = unit;
return future = super.scheduleWithFixedDelay(command, intialDelay, delay, unit);
return future = super.scheduleWithFixedDelay(command, initialDelay, delay, unit);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static void main(String[] args) throws Exception {
port = Integer.parseInt(args[1]); // Use the second argument as the server port if provided
}
if (args.length > 2) {
user = args[2]; // Use the the third argument as the name to greet if provided
user = args[2]; // Use the third argument as the name to greet if provided
}
if (args.length > 3) {
clientId = args[3]; // Use the fourth argument as the client identifier if provided
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static void main(String[] args) throws Exception {
port = Integer.parseInt(args[1]); // Use the second argument as the server port if provided
}
if (args.length > 2) {
user = args[2]; // Use the the third argument as the name to greet if provided
user = args[2]; // Use the third argument as the name to greet if provided
}
if (args.length > 3) {
clientId = args[3]; // Use the fourth argument as the client identifier if provided
Expand Down
2 changes: 1 addition & 1 deletion netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ public NettyChannelBuilder localSocketPicker(@Nullable LocalSocketPicker localSo
}

/**
* This class is meant to be overriden with a custom implementation of
* This class is meant to be overridden with a custom implementation of
* {@link #createSocketAddress}. The default implementation is a no-op.
*
* @since 1.16.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ protected final ByteBuf captureWrite(ChannelHandlerContext ctx) {
protected abstract void makeStream() throws Exception;

@Test
public void dataPingSentOnHeaderRecieved() throws Exception {
public void dataPingSentOnHeaderReceived() throws Exception {
manualSetUp();
makeStream();
AbstractNettyHandler handler = (AbstractNettyHandler) handler();
Expand Down
2 changes: 1 addition & 1 deletion okhttp/src/main/java/io/grpc/okhttp/AsyncSink.java
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public void doRun() throws IOException {
synchronized (lock) {
buf.write(buffer, buffer.completeSegmentByteCount());
writeEnqueued = false;
// Imprecise because we only tranfer complete segments, but not by much and error
// Imprecise because we only transfer complete segments, but not by much and error
// won't accumulate over time
writingControlFrames = queuedControlFrames;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ public void close() {
}
if (sslSocketFactory != null) {
SSLSocket sslSocket = OkHttpTlsUpgrader.upgrade(
sslSocketFactory, hostnameVerifier, sock, getOverridenHost(), getOverridenPort(),
sslSocketFactory, hostnameVerifier, sock, getOverriddenHost(), getOverriddenPort(),
connectionSpec);
sslSession = sslSocket.getSession();
sock = sslSocket;
Expand Down Expand Up @@ -954,7 +954,7 @@ public InternalLogId getLogId() {
* authority, uri.getHost() will (rightly) return null, since the authority is no longer
* an actual service. This method overrides the behavior for practical reasons. For example,
* if an authority is in the form "invalid_authority" (note the "_"), rather than return null,
* we return the input. This is because the return value, in conjunction with getOverridenPort,
* we return the input. This is because the return value, in conjunction with getOverriddenPort,
* are used by the SSL library to reconstruct the actual authority. It /already/ has a
* connection to the port, independent of this function.
*
Expand All @@ -963,7 +963,7 @@ public InternalLogId getLogId() {
* authorities do not have ports, so this is even more wrong than before. Sorry.
*/
@VisibleForTesting
String getOverridenHost() {
String getOverriddenHost() {
URI uri = GrpcUtil.authorityToUri(defaultAuthority);
if (uri.getHost() != null) {
return uri.getHost();
Expand All @@ -973,7 +973,7 @@ String getOverridenHost() {
}

@VisibleForTesting
int getOverridenPort() {
int getOverriddenPort() {
URI uri = GrpcUtil.authorityToUri(defaultAuthority);
if (uri.getPort() != -1) {
return uri.getPort();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1800,8 +1800,8 @@ public void invalidAuthorityPropagates() {
tooManyPingsRunnable,
null);

String host = clientTransport.getOverridenHost();
int port = clientTransport.getOverridenPort();
String host = clientTransport.getOverriddenHost();
int port = clientTransport.getOverriddenPort();

assertEquals("invalid_authority", host);
assertEquals(1234, port);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
}
}
// Only record method name as an attribute if isSampledToLocalTracing is set to true,
// which is true for all generated methods. Otherwise, programatically
// which is true for all generated methods. Otherwise, programmatically
// created methods result in high cardinality metrics.
final CallAttemptsTracerFactory tracerFactory = new CallAttemptsTracerFactory(
OpenTelemetryMetricsModule.this, target,
Expand Down
2 changes: 1 addition & 1 deletion xds/src/main/java/io/grpc/xds/RingHashLoadBalancer.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
long minWeight = Collections.min(serverWeights.values());
double normalizedMinWeight = (double) minWeight / totalWeight;
// Scale up the number of hashes per host such that the least-weighted host gets a whole
// number of hashes on the the ring. Other hosts might not end up with whole numbers, and
// number of hashes on the ring. Other hosts might not end up with whole numbers, and
// that's fine (the ring-building algorithm can handle this). This preserves the original
// implementation's behavior: when weights aren't provided, all hosts should get an equal
// number of hashes. In the case where this number exceeds the max_ring_size, it's scaled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ weights[0], newChildConfig(fakeLbProvider, configs[0])),
.build());

// Both of the two child LB policies will call the helper to update the balancing state.
// But since those calls happen during the handling of teh resolved addresses of the parent
// But since those calls happen during the handling of the resolved addresses of the parent
// WeightedTargetLLoadBalancer, the overall balancing state should only be updated once.
verify(helper, times(1)).updateBalancingState(any(), any());

Expand Down
2 changes: 1 addition & 1 deletion xds/src/test/java/io/grpc/xds/orca/OrcaOobUtilTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ public void reportWithMostFrequentIntervalRequested() {
assertThat(orcaServiceImps[0].calls).hasSize(1);
assertLog(subchannels[0].logs,
"DEBUG: Starting ORCA reporting for " + subchannels[0].getAllAddresses());
// ORCA reporting RPC restarts and the the real report interval is adjusted.
// ORCA reporting RPC restarts and the real report interval is adjusted.
assertThat(Durations.toNanos(orcaServiceImps[0].calls.poll().request.getReportInterval()))
.isEqualTo(MEDIUM_INTERVAL_CONFIG.getReportIntervalNanos());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ message RateLimitQuotaBucketSettings {
//
// * static ``StringValue string_value`` — becomes the value in the ``BucketId`` map as is.
// * dynamic ``TypedExtensionConfig custom_value`` — evaluated for each request. Must produce
// a string output, which becomes the value in the the ``BucketId`` map.
// a string output, which becomes the value in the ``BucketId`` map.
//
// See usage examples in the docs to :ref:`bucket_id_builder
// <envoy_v3_api_field_extensions.filters.http.rate_limit_quota.v3.RateLimitQuotaBucketSettings.bucket_id_builder>`
Expand Down Expand Up @@ -407,7 +407,7 @@ message RateLimitQuotaBucketSettings {
DenyResponseSettings deny_response_settings = 3;

// Configures the behavior in the "no assignment" state: after the first request has been
// matched to the bucket, and before the the RLQS server returns the first quota assignment.
// matched to the bucket, and before the RLQS server returns the first quota assignment.
//
// If not set, the default behavior is to allow all requests.
NoAssignmentBehavior no_assignment_behavior = 4;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ message CommonTlsContext {
// fetched/refreshed over the network asynchronously with respect to the TLS handshake.
//
// The same number and types of certificates as :ref:`tls_certificates <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificates>`
// are valid in the the certificates fetched through this setting.
// are valid in the certificates fetched through this setting.
//
// If ``tls_certificates`` or ``tls_certificate_provider_instance`` are set, this field
// is ignored.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ option (xds.annotations.v3.file_status).work_in_progress = true;

// [#protodoc-title: Rate Limit Quota Service (RLQS)]

// The Rate Limit Quota Service (RLQS) is a Envoy global rate limiting service that allows to
// The Rate Limit Quota Service (RLQS) is an Envoy global rate limiting service that allows to
// delegate rate limit decisions to a remote service. The service will aggregate the usage reports
// from multiple data plane instances, and distribute Rate Limit Assignments to each instance
// based on its business logic. The logic is outside of the scope of the protocol API.
Expand Down Expand Up @@ -171,7 +171,7 @@ message RateLimitQuotaResponse {
// <envoy_v3_api_field_service.rate_limit_quota.v3.RateLimitQuotaResponse.BucketAction.bucket_id>`.
//
// If no requests are reported for a bucket, after some time the server considers the bucket
// inactive. The server stops tracking the bucket, and instructs the the data plane to abandon
// inactive. The server stops tracking the bucket, and instructs the data plane to abandon
// the bucket via this message.
//
// **Abandoning the assignment**
Expand Down