From 7a5288d2a0dcc5b676f0dc275907e1dc4322ebcc Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 8 Feb 2021 14:29:18 -0800 Subject: [PATCH] Replace disrespectful words --- package.xml | 2 +- src/core/lib/iomgr/timer_manager.cc | 2 +- src/csharp/Grpc.Core.Tests/ShutdownTest.cs | 2 +- src/csharp/Grpc.Core/GrpcEnvironment.cs | 2 +- src/objective-c/NetworkTransitionBehavior.md | 2 +- src/php/docker/README.md | 2 +- src/python/grpcio/grpc/_channel.py | 2 +- src/python/grpcio_tests/tests/fork/_fork_interop_test.py | 2 +- src/python/grpcio_tests/tests/unit/_exit_test.py | 2 +- .../grpcio_tests/tests/unit/_server_shutdown_test.py | 2 +- src/python/grpcio_tests/tests/unit/_signal_client.py | 4 ++-- .../tests/unit/framework/common/test_control.py | 2 +- src/ruby/end2end/channel_closing_client.rb | 2 +- src/ruby/end2end/channel_closing_test.rb | 2 +- src/ruby/end2end/channel_state_test.rb | 2 +- src/ruby/end2end/killed_client_thread_test.rb | 2 +- src/ruby/spec/generic/client_stub_spec.rb | 8 ++++---- templates/package.xml.template | 2 +- test/core/end2end/multiple_server_queues_test.cc | 2 +- test/core/end2end/tests/filter_init_fails.cc | 2 +- ...troy_grpclb_channel_with_active_connect_stress_test.cc | 2 +- test/cpp/end2end/cfstream_test.cc | 4 ++-- tools/internal_ci/linux/grpc_microbenchmark_diff.sh | 2 +- tools/internal_ci/linux/grpc_performance_profile_daily.sh | 2 +- .../internal_ci/linux/grpc_performance_profile_master.sh | 2 +- tools/internal_ci/linux/grpc_trickle_diff.sh | 2 +- tools/internal_ci/macos/grpc_run_bazel_isolated_tests.sh | 2 +- tools/internal_ci/macos/grpc_run_tests_matrix.sh | 2 +- tools/run_tests/artifacts/artifact_targets.py | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package.xml b/package.xml index bc9b9185eb8..8d81ef13fa4 100644 --- a/package.xml +++ b/package.xml @@ -2191,7 +2191,7 @@ Update to wrap gRPC C Core version 0.10.0 BSD - GA release -- Fix shutdown hang problem #4017 +- Fix shutdown freeze problem #4017 diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index e2347276722..bf467cb5c44 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -133,7 +133,7 @@ static void run_some_timers() { } grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); - // garbage collect any threads hanging out that are dead + // garbage collect any threads that are dead gc_completed_threads(); // get ready to wait again ++g_waiter_count; diff --git a/src/csharp/Grpc.Core.Tests/ShutdownTest.cs b/src/csharp/Grpc.Core.Tests/ShutdownTest.cs index 3eaccf122b8..8654e33924d 100644 --- a/src/csharp/Grpc.Core.Tests/ShutdownTest.cs +++ b/src/csharp/Grpc.Core.Tests/ShutdownTest.cs @@ -59,7 +59,7 @@ namespace Grpc.Core.Tests await readyToShutdown.Task; // make sure handler is running await channel.ShutdownAsync(); // channel.ShutdownAsync() works even if there's a pending call. - await server.KillAsync(); // server.ShutdownAsync() would hang waiting for the call to finish. + await server.KillAsync(); // server.ShutdownAsync() would freeze waiting for the call to finish. } } } diff --git a/src/csharp/Grpc.Core/GrpcEnvironment.cs b/src/csharp/Grpc.Core/GrpcEnvironment.cs index ef9e700140a..45e44e6f50e 100644 --- a/src/csharp/Grpc.Core/GrpcEnvironment.cs +++ b/src/csharp/Grpc.Core/GrpcEnvironment.cs @@ -465,7 +465,7 @@ namespace Grpc.Core // when the framework attempts to run the finalizers for SafeHandle object representing the native // grpc objects. The finalizers calls the native grpc_*_destroy methods (e.g. grpc_server_destroy) // in a random order, which is not supported by gRPC. - // - On Mono, the process would hang as the GrpcThreadPool threads are sleeping + // - On Mono, the process would freeze as the GrpcThreadPool threads are sleeping // in grpc_completion_queue_next P/Invoke invocation and mono won't let the // process shutdown until the P/Invoke calls return. We achieve that by shutting down // the completion queue(s) which associated with the GrpcThreadPool, which will diff --git a/src/objective-c/NetworkTransitionBehavior.md b/src/objective-c/NetworkTransitionBehavior.md index ef1d3de69b5..bf1292162a2 100644 --- a/src/objective-c/NetworkTransitionBehavior.md +++ b/src/objective-c/NetworkTransitionBehavior.md @@ -50,7 +50,7 @@ using TCP sockets: background. When a TCP connection breaks in the background for the reason like WiFi connects to another hotspot, the socket neither return an error nor continue sending/receiving data on it, but still accepts write on it. -In both situations, the user will see the call hang for an extended period of +In both situations, the user will see the call freeze for an extended period of time before the TCP socket times out. #### gRPC iOS library's resolution to TCP socket issues diff --git a/src/php/docker/README.md b/src/php/docker/README.md index 1f73c825987..26741d2649b 100644 --- a/src/php/docker/README.md +++ b/src/php/docker/README.md @@ -168,7 +168,7 @@ NOTE: PHP 5.x has reached the end-of-life state and is no longer supported. ### `fork-support` This image tests `pcntl_fork()` support and makes sure scripts using -`pcntl_fork()` don't hang or crash. +`pcntl_fork()` don't freeze or crash. Build `grpc-ext` docker image: ```sh diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index 51b96e33bfd..34c475067c7 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -1546,7 +1546,7 @@ class Channel(grpc.Channel): # here (or more likely, call self._close() here). We don't do this today # because many valid use cases today allow the channel to be deleted # immediately after stubs are created. After a sufficient period of time - # has passed for all users to be trusted to hang out to their channels + # has passed for all users to be trusted to freeze out to their channels # for as long as they are in use and to close them after using them, # then deletion of this grpc._channel.Channel instance can be made to # effect closure of the underlying cygrpc.Channel instance. diff --git a/src/python/grpcio_tests/tests/fork/_fork_interop_test.py b/src/python/grpcio_tests/tests/fork/_fork_interop_test.py index 7ff4751a090..a6fd5f8624c 100644 --- a/src/python/grpcio_tests/tests/fork/_fork_interop_test.py +++ b/src/python/grpcio_tests/tests/fork/_fork_interop_test.py @@ -23,7 +23,7 @@ from grpc._cython import cygrpc from tests.fork import methods # New instance of multiprocessing.Process using fork without exec can and will -# hang if the Python process has any other threads running. This includes the +# freeze if the Python process has any other threads running. This includes the # additional thread spawned by our _runner.py class. So in order to test our # compatibility with multiprocessing, we first fork+exec a new process to ensure # we don't have any conflicting background threads. diff --git a/src/python/grpcio_tests/tests/unit/_exit_test.py b/src/python/grpcio_tests/tests/unit/_exit_test.py index 031c2da18a4..925b37e05ee 100644 --- a/src/python/grpcio_tests/tests/unit/_exit_test.py +++ b/src/python/grpcio_tests/tests/unit/_exit_test.py @@ -14,7 +14,7 @@ """Tests clean exit of server/client on Python Interpreter exit/sigint. The tests in this module spawn a subprocess for each test case, the -test is considered successful if it doesn't hang/timeout. +test is considered successful if it doesn't freeze/timeout. """ import atexit diff --git a/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py b/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py index f1b5e448dbb..70ad1eb802c 100644 --- a/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py +++ b/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py @@ -14,7 +14,7 @@ """Tests clean shutdown of server on various interpreter exit conditions. The tests in this module spawn a subprocess for each test case, the -test is considered successful if it doesn't hang/timeout. +test is considered successful if it doesn't freeze/timeout. """ import atexit diff --git a/src/python/grpcio_tests/tests/unit/_signal_client.py b/src/python/grpcio_tests/tests/unit/_signal_client.py index 0be1270749c..5cc68831f7e 100644 --- a/src/python/grpcio_tests/tests/unit/_signal_client.py +++ b/src/python/grpcio_tests/tests/unit/_signal_client.py @@ -82,7 +82,7 @@ def main_unary_with_exception(server_target): sys.stderr.write("Running signal handler.\n") sys.stderr.flush() - # This call should not hang. + # This call should not freeze. channel.close() @@ -97,7 +97,7 @@ def main_streaming_with_exception(server_target): sys.stderr.write("Running signal handler.\n") sys.stderr.flush() - # This call should not hang. + # This call should not freeze. channel.close() diff --git a/src/python/grpcio_tests/tests/unit/framework/common/test_control.py b/src/python/grpcio_tests/tests/unit/framework/common/test_control.py index 6a422825cc7..999cb5f229d 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/test_control.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/test_control.py @@ -34,7 +34,7 @@ class Control(six.with_metaclass(abc.ABCMeta)): Systems under test passed a Control should call its control() method frequently during execution. The control() method may block, raise an exception, or do nothing, all according to the enclosing test's desire for - the system under test to simulate hanging, failing, or functioning. + the system under test to simulate freezing, failing, or functioning. """ @abc.abstractmethod diff --git a/src/ruby/end2end/channel_closing_client.rb b/src/ruby/end2end/channel_closing_client.rb index 62c742158a9..78afd11badd 100755 --- a/src/ruby/end2end/channel_closing_client.rb +++ b/src/ruby/end2end/channel_closing_client.rb @@ -17,7 +17,7 @@ require_relative './end2end_common' # Calls '#close' on a Channel when "shutdown" called. This tries to -# trigger a hang or crash bug by closing a channel actively being watched +# trigger a freeze or crash bug by closing a channel actively being watched class ChannelClosingClientController < ClientControl::ClientController::Service def initialize(ch) @ch = ch diff --git a/src/ruby/end2end/channel_closing_test.rb b/src/ruby/end2end/channel_closing_test.rb index 10c7d7fca02..6a151a4a4f5 100755 --- a/src/ruby/end2end/channel_closing_test.rb +++ b/src/ruby/end2end/channel_closing_test.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# make sure that the client doesn't hang when channel is closed +# make sure that the client doesn't freeze when channel is closed # explicitly while it's used require_relative './end2end_common' diff --git a/src/ruby/end2end/channel_state_test.rb b/src/ruby/end2end/channel_state_test.rb index f4b1cd2bb86..2b180cff48e 100755 --- a/src/ruby/end2end/channel_state_test.rb +++ b/src/ruby/end2end/channel_state_test.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# make sure that the client doesn't hang when process ended abruptly +# make sure that the client doesn't freeze when process ended abruptly require_relative './end2end_common' diff --git a/src/ruby/end2end/killed_client_thread_test.rb b/src/ruby/end2end/killed_client_thread_test.rb index 370f7e686bb..bd9e9e1102f 100755 --- a/src/ruby/end2end/killed_client_thread_test.rb +++ b/src/ruby/end2end/killed_client_thread_test.rb @@ -46,7 +46,7 @@ def main end service_impl = SleepingEchoServerImpl.new(received_rpc_callback) - # RPCs against the server will all be hanging, so kill thread + # RPCs against the server will all be freezing, so kill thread # pool workers immediately rather than after waiting for a second. rpc_server_args = { poll_period: 0, pool_keep_alive: 0 } server_runner = ServerRunner.new(service_impl, rpc_server_args: rpc_server_args) diff --git a/src/ruby/spec/generic/client_stub_spec.rb b/src/ruby/spec/generic/client_stub_spec.rb index 200139d8493..b55f6b41317 100644 --- a/src/ruby/spec/generic/client_stub_spec.rb +++ b/src/ruby/spec/generic/client_stub_spec.rb @@ -304,7 +304,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe 'via a call operation' do after(:each) do - # make sure op.wait doesn't hang, even if there's a bad status + # make sure op.wait doesn't freeze, even if there's a bad status @op.wait end def get_response(stub, run_start_call_first: false, credentials: nil) @@ -406,7 +406,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe 'via a call operation' do after(:each) do - # make sure op.wait doesn't hang, even if there's a bad status + # make sure op.wait doesn't freeze, even if there's a bad status @op.wait end def get_response(stub, run_start_call_first: false) @@ -547,7 +547,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe 'via a call operation' do after(:each) do - @op.wait # make sure wait doesn't hang + @op.wait # make sure wait doesn't freeze end def get_responses(stub, run_start_call_first: false, unmarshal: noop) @op = stub.server_streamer(@method, @sent_msg, noop, unmarshal, @@ -865,7 +865,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe 'via a call operation' do after(:each) do - @op.wait # make sure wait doesn't hang + @op.wait # make sure wait doesn't freeze end def get_responses(stub, run_start_call_first: false, deadline: nil, marshal_proc: noop) diff --git a/templates/package.xml.template b/templates/package.xml.template index de65792d4ef..de76abd03bf 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -221,7 +221,7 @@ BSD - GA release - - Fix shutdown hang problem #4017 + - Fix shutdown freeze problem #4017 diff --git a/test/core/end2end/multiple_server_queues_test.cc b/test/core/end2end/multiple_server_queues_test.cc index 5ae828c1e39..bb4e3dac106 100644 --- a/test/core/end2end/multiple_server_queues_test.cc +++ b/test/core/end2end/multiple_server_queues_test.cc @@ -53,7 +53,7 @@ int main(int argc, char** argv) { grpc_server_start(server); grpc_server_shutdown_and_notify(server, cq2, nullptr); grpc_completion_queue_next(cq2, gpr_inf_future(GPR_CLOCK_REALTIME), - nullptr); /* cue queue hang */ + nullptr); /* cue queue freeze */ grpc_completion_queue_shutdown(cq1); grpc_completion_queue_shutdown(cq2); grpc_completion_queue_shutdown(cq3); diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 2ac21cf0035..1ab361acd5e 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -538,7 +538,7 @@ static void filter_init_fails_internal(grpc_end2end_test_config config) { // If the client handshake completes before the server handshake and the // client is able to send application data before the server handshake // completes, then testing the CLIENT_SUBCHANNEL filter will cause the server - // to hang waiting for the final handshake message from the client. This + // to freeze waiting for the final handshake message from the client. This // handshake message will never arrive because it would have been sent with // the first application data message, which failed because of the filter. if ((config.feature_mask & FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL) && diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index c97be68ed47..f58db7ecdd2 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -55,7 +55,7 @@ void TryConnectAndDestroy() { grpc_core::MakeRefCounted(); // Return a grpclb address with an IP address on the IPv6 discard prefix // (https://tools.ietf.org/html/rfc6666). This is important because - // the behavior we want in this test is for a TCP connect attempt to "hang", + // the behavior we want in this test is for a TCP connect attempt to "freeze", // i.e. we want to send SYN, and then *not* receive SYN-ACK or RST. // The precise behavior is dependant on the test runtime environment though, // since connect() attempts on this address may unfortunately result in diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index a7e3a9f8b91..9d04020ad29 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -190,9 +190,9 @@ class CFStreamTest : public ::testing::TestWithParam { } else { GPR_ASSERT(ret == grpc::CompletionQueue::TIMEOUT); // This can happen if we hit the Apple CFStream bug which results in the - // read stream hanging. We are ignoring hangs and timeouts, but these + // read stream freezing. We are ignoring hangs and timeouts, but these // tests are still useful as they can catch memory memory corruptions, - // crashes and other bugs that don't result in test hang/timeout. + // crashes and other bugs that don't result in test freeze/timeout. return false; } } diff --git a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh index c03383d1461..580c184b776 100755 --- a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh +++ b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh @@ -31,7 +31,7 @@ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks -d "origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH" \ -b $BENCHMARKS_TO_RUN || FAILED="true" -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 if [ "$FAILED" != "" ] diff --git a/tools/internal_ci/linux/grpc_performance_profile_daily.sh b/tools/internal_ci/linux/grpc_performance_profile_daily.sh index 5fe47ff6c37..1dba44b524b 100755 --- a/tools/internal_ci/linux/grpc_performance_profile_daily.sh +++ b/tools/internal_ci/linux/grpc_performance_profile_daily.sh @@ -26,7 +26,7 @@ CPUS=`python -c 'import multiprocessing; print multiprocessing.cpu_count()'` tools/run_tests/run_microbenchmark.py --collect summary --bigquery_upload || FAILED="true" -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 if [ "$FAILED" != "" ] diff --git a/tools/internal_ci/linux/grpc_performance_profile_master.sh b/tools/internal_ci/linux/grpc_performance_profile_master.sh index fbff17466bb..93454b7f7b1 100755 --- a/tools/internal_ci/linux/grpc_performance_profile_master.sh +++ b/tools/internal_ci/linux/grpc_performance_profile_master.sh @@ -22,7 +22,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc tools/internal_ci/linux/run_performance_profile_hourly.sh || FAILED="true" -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 if [ "$FAILED" != "" ] diff --git a/tools/internal_ci/linux/grpc_trickle_diff.sh b/tools/internal_ci/linux/grpc_trickle_diff.sh index 49c3d4b2db0..a7640956e40 100755 --- a/tools/internal_ci/linux/grpc_trickle_diff.sh +++ b/tools/internal_ci/linux/grpc_trickle_diff.sh @@ -33,7 +33,7 @@ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks --no-counters \ --pr_comment_name trickle || FAILED="true" -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 if [ "$FAILED" != "" ] diff --git a/tools/internal_ci/macos/grpc_run_bazel_isolated_tests.sh b/tools/internal_ci/macos/grpc_run_bazel_isolated_tests.sh index 7e134771d39..e213105d61d 100644 --- a/tools/internal_ci/macos/grpc_run_bazel_isolated_tests.sh +++ b/tools/internal_ci/macos/grpc_run_bazel_isolated_tests.sh @@ -38,6 +38,6 @@ sudo sntp -sS pool.ntp.org # The "local" execution strategy is required because the test runs sudo and that doesn't work in a sandboxed environment (the default on mac) tools/bazel test $RUN_TESTS_FLAGS --genrule_strategy=local --test_output=all //test/cpp/common:time_jump_test -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 diff --git a/tools/internal_ci/macos/grpc_run_tests_matrix.sh b/tools/internal_ci/macos/grpc_run_tests_matrix.sh index 7636a31f410..b74508b7eb0 100755 --- a/tools/internal_ci/macos/grpc_run_tests_matrix.sh +++ b/tools/internal_ci/macos/grpc_run_tests_matrix.sh @@ -22,7 +22,7 @@ source tools/internal_ci/helper_scripts/prepare_build_macos_rc tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS || FAILED="true" -# kill port_server.py to prevent the build from hanging +# kill port_server.py to prevent the build from freezing ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 tools/internal_ci/helper_scripts/delete_nonartifacts.sh || true diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index a8f901369de..55e70d29a4b 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -123,7 +123,7 @@ class PythonArtifact: self.py_version) environ['PIP'] = '/usr/local/bin/pip{}'.format(self.py_version) # https://github.com/resin-io-projects/armv7hf-debian-qemu/issues/9 - # A QEMU bug causes submodule update to hang, so we copy directly + # A QEMU bug causes submodule update to freeze, so we copy directly environ['RELATIVE_COPY_PATH'] = '.' # Parallel builds are counterproductive in emulated environment environ['GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS'] = '1'