Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge github.com:grpc/grpc into optionalize_client_config

Browse Source
pull/6043/head
Craig Tiller 9 years ago
parent 0b0147c457 2a17df28dd
commit 21f8907167
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/ruby/lib/grpc/generic/rpc_server.rb
  2. 5
      src/ruby/spec/generic/rpc_server_spec.rb
  3. 3
      tools/run_tests/run_node.sh

4
src/ruby/lib/grpc/generic/rpc_server.rb
Unescape View File

@ -403,7 +403,7 @@ module GRPC
loop_handle_server_calls loop_handle_server_calls
end end
# Sends UNAVAILABLE if there are too many unprocessed jobs # Sends RESOURCE_EXHAUSTED if there are too many unprocessed jobs
def available?(an_rpc) def available?(an_rpc)
jobs_count, max = @pool.jobs_waiting, @max_waiting_requests jobs_count, max = @pool.jobs_waiting, @max_waiting_requests
GRPC.logger.info("waiting: #{jobs_count}, max: #{max}") GRPC.logger.info("waiting: #{jobs_count}, max: #{max}")
@ -411,7 +411,7 @@ module GRPC
GRPC.logger.warn("NOT AVAILABLE: too many jobs_waiting: #{an_rpc}") GRPC.logger.warn("NOT AVAILABLE: too many jobs_waiting: #{an_rpc}")
noop = proc { |x| x } noop = proc { |x| x }
c = ActiveCall.new(an_rpc.call, @cq, noop, noop, an_rpc.deadline) c = ActiveCall.new(an_rpc.call, @cq, noop, noop, an_rpc.deadline)
c.send_status(StatusCodes::UNAVAILABLE, '') c.send_status(StatusCodes::RESOURCE_EXHAUSTED, '')
nil nil
end end

5
src/ruby/spec/generic/rpc_server_spec.rb
Unescape View File

@ -426,7 +426,7 @@ describe GRPC::RpcServer do
threads.each(&:join) threads.each(&:join)
end end
it 'should return UNAVAILABLE on too many jobs', server: true do it 'should return RESOURCE_EXHAUSTED on too many jobs', server: true do
opts = { opts = {
a_channel_arg: 'an_arg', a_channel_arg: 'an_arg',
server_override: @server, server_override: @server,
@ -449,7 +449,8 @@ describe GRPC::RpcServer do
begin begin
stub.an_rpc(req) stub.an_rpc(req)
rescue GRPC::BadStatus => e rescue GRPC::BadStatus => e
one_failed_as_unavailable = e.code == StatusCodes::UNAVAILABLE one_failed_as_unavailable =
e.code == StatusCodes::RESOURCE_EXHAUSTED
end end
end end
end end

3
tools/run_tests/run_node.sh
Unescape View File

@ -48,6 +48,7 @@ if [ "$CONFIG" = "gcov" ]
then then
./node_modules/.bin/istanbul cover --dir reports/node_coverage \ ./node_modules/.bin/istanbul cover --dir reports/node_coverage \
-x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory -x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory
cp -r reports/node_coverage/lcov-report/* reports/node_coverage/
cd build cd build
gcov Release/obj.target/grpc/ext/*.o gcov Release/obj.target/grpc/ext/*.o
lcov --base-directory . --directory . -c -o coverage.info lcov --base-directory . --directory . -c -o coverage.info
@ -55,8 +56,6 @@ then
genhtml -o ../reports/node_ext_coverage --num-spaces 2 \ genhtml -o ../reports/node_ext_coverage --num-spaces 2 \
-t 'Node gRPC test coverage' coverage.info --rc genhtml_hi_limit=95 \ -t 'Node gRPC test coverage' coverage.info --rc genhtml_hi_limit=95 \
--rc genhtml_med_limit=80 --no-prefix --rc genhtml_med_limit=80 --no-prefix
echo '<html><head><meta http-equiv="refresh" content="0;URL=lcov-report/index.html"></head></html>' > \
../reports/node_coverage/index.html
else else
JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \
./node_modules/.bin/mocha --timeout $timeout \ ./node_modules/.bin/mocha --timeout $timeout \

Write Preview
Loading…
Cancel
Save