Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
515b0a93
Commit
515b0a93
authored
9 years ago
by
Nathaniel Manista
Browse files
Options
Downloads
Patches
Plain Diff
Service-side read without allowance
This compensates for the abstraction mismatch described in issue 2916.
parent
a39d739c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/python/grpcio/grpc/_links/service.py
+31
-12
31 additions, 12 deletions
src/python/grpcio/grpc/_links/service.py
src/python/grpcio_test/grpc_test/framework/interfaces/links/test_cases.py
+1
-8
1 addition, 8 deletions
...o_test/grpc_test/framework/interfaces/links/test_cases.py
with
32 additions
and
20 deletions
src/python/grpcio/grpc/_links/service.py
+
31
−
12
View file @
515b0a93
...
@@ -44,7 +44,10 @@ from grpc.framework.interfaces.links import links
...
@@ -44,7 +44,10 @@ from grpc.framework.interfaces.links import links
@enum.unique
@enum.unique
class
_Read
(
enum
.
Enum
):
class
_Read
(
enum
.
Enum
):
READING
=
'
reading
'
READING
=
'
reading
'
AWAITING_ALLOWANCE
=
'
awaiting allowance
'
# TODO(issue 2916): This state will again be necessary after eliminating the
# "early_read" field of _RPCState and going back to only reading when granted
# allowance to read.
# AWAITING_ALLOWANCE = 'awaiting allowance'
CLOSED
=
'
closed
'
CLOSED
=
'
closed
'
...
@@ -67,12 +70,15 @@ class _RPCState(object):
...
@@ -67,12 +70,15 @@ class _RPCState(object):
def
__init__
(
def
__init__
(
self
,
request_deserializer
,
response_serializer
,
sequence_number
,
read
,
self
,
request_deserializer
,
response_serializer
,
sequence_number
,
read
,
allowance
,
high_write
,
low_write
,
premetadataed
,
terminal_metadata
,
code
,
early_read
,
allowance
,
high_write
,
low_write
,
premetadataed
,
message
):
terminal_metadata
,
code
,
message
):
self
.
request_deserializer
=
request_deserializer
self
.
request_deserializer
=
request_deserializer
self
.
response_serializer
=
response_serializer
self
.
response_serializer
=
response_serializer
self
.
sequence_number
=
sequence_number
self
.
sequence_number
=
sequence_number
self
.
read
=
read
self
.
read
=
read
# TODO(issue 2916): Eliminate this by eliminating the necessity of calling
# call.read just to advance the RPC.
self
.
early_read
=
early_read
# A raw (not deserialized) read.
self
.
allowance
=
allowance
self
.
allowance
=
allowance
self
.
high_write
=
high_write
self
.
high_write
=
high_write
self
.
low_write
=
low_write
self
.
low_write
=
low_write
...
@@ -120,7 +126,7 @@ class _Kernel(object):
...
@@ -120,7 +126,7 @@ class _Kernel(object):
call
.
read
(
call
)
call
.
read
(
call
)
self
.
_rpc_states
[
call
]
=
_RPCState
(
self
.
_rpc_states
[
call
]
=
_RPCState
(
request_deserializer
,
response_serializer
,
1
,
_Read
.
READING
,
0
,
request_deserializer
,
response_serializer
,
1
,
_Read
.
READING
,
None
,
1
,
_HighWrite
.
OPEN
,
_LowWrite
.
OPEN
,
False
,
None
,
None
,
None
)
_HighWrite
.
OPEN
,
_LowWrite
.
OPEN
,
False
,
None
,
None
,
None
)
ticket
=
links
.
Ticket
(
ticket
=
links
.
Ticket
(
call
,
0
,
group
,
method
,
links
.
Ticket
.
Subscription
.
FULL
,
call
,
0
,
group
,
method
,
links
.
Ticket
.
Subscription
.
FULL
,
...
@@ -140,12 +146,15 @@ class _Kernel(object):
...
@@ -140,12 +146,15 @@ class _Kernel(object):
termination
=
links
.
Ticket
.
Termination
.
COMPLETION
termination
=
links
.
Ticket
.
Termination
.
COMPLETION
else
:
else
:
if
0
<
rpc_state
.
allowance
:
if
0
<
rpc_state
.
allowance
:
payload
=
rpc_state
.
request_deserializer
(
event
.
bytes
)
termination
=
None
rpc_state
.
allowance
-=
1
rpc_state
.
allowance
-=
1
call
.
read
(
call
)
call
.
read
(
call
)
else
:
else
:
rpc_state
.
read
=
_Read
.
AWAITING_ALLOWANCE
rpc_state
.
early_read
=
event
.
bytes
payload
=
rpc_state
.
request_deserializer
(
event
.
bytes
)
return
termination
=
None
# TODO(issue 2916): Instead of returning:
# rpc_state.read = _Read.AWAITING_ALLOWANCE
ticket
=
links
.
Ticket
(
ticket
=
links
.
Ticket
(
call
,
rpc_state
.
sequence_number
,
None
,
None
,
None
,
None
,
None
,
None
,
call
,
rpc_state
.
sequence_number
,
None
,
None
,
None
,
None
,
None
,
None
,
payload
,
None
,
None
,
None
,
termination
)
payload
,
None
,
None
,
None
,
termination
)
...
@@ -237,12 +246,22 @@ class _Kernel(object):
...
@@ -237,12 +246,22 @@ class _Kernel(object):
rpc_state
.
premetadataed
=
True
rpc_state
.
premetadataed
=
True
if
ticket
.
allowance
is
not
None
:
if
ticket
.
allowance
is
not
None
:
if
rpc_state
.
read
is
_Read
.
AWAITING_ALLOWANCE
:
if
rpc_state
.
early_read
is
None
:
rpc_state
.
allowance
+=
ticket
.
allowance
-
1
call
.
read
(
call
)
rpc_state
.
read
=
_Read
.
READING
else
:
rpc_state
.
allowance
+=
ticket
.
allowance
rpc_state
.
allowance
+=
ticket
.
allowance
else
:
payload
=
rpc_state
.
request_deserializer
(
rpc_state
.
early_read
)
rpc_state
.
allowance
+=
ticket
.
allowance
-
1
rpc_state
.
early_read
=
None
if
rpc_state
.
read
is
_Read
.
READING
:
call
.
read
(
call
)
termination
=
None
else
:
termination
=
links
.
Ticket
.
Termination
.
COMPLETION
ticket
=
links
.
Ticket
(
call
,
rpc_state
.
sequence_number
,
None
,
None
,
None
,
None
,
None
,
None
,
payload
,
None
,
None
,
None
,
termination
)
rpc_state
.
sequence_number
+=
1
self
.
_relay
.
add_value
(
ticket
)
if
ticket
.
payload
is
not
None
:
if
ticket
.
payload
is
not
None
:
call
.
write
(
rpc_state
.
response_serializer
(
ticket
.
payload
),
call
)
call
.
write
(
rpc_state
.
response_serializer
(
ticket
.
payload
),
call
)
...
...
This diff is collapsed.
Click to expand it.
src/python/grpcio_test/grpc_test/framework/interfaces/links/test_cases.py
+
1
−
8
View file @
515b0a93
...
@@ -303,16 +303,9 @@ class TransmissionTest(object):
...
@@ -303,16 +303,9 @@ class TransmissionTest(object):
invocation_message
,
links
.
Ticket
.
Termination
.
COMPLETION
)
invocation_message
,
links
.
Ticket
.
Termination
.
COMPLETION
)
self
.
_invocation_link
.
accept_ticket
(
original_invocation_ticket
)
self
.
_invocation_link
.
accept_ticket
(
original_invocation_ticket
)
# TODO(nathaniel): This shouldn't be necessary. Detecting the end of the
# invocation-side ticket sequence shouldn't require granting allowance for
# another payload.
self
.
_service_mate
.
block_until_tickets_satisfy
(
self
.
_service_mate
.
block_until_tickets_satisfy
(
at_least_n_payloads_received_predicate
(
1
))
at_least_n_payloads_received_predicate
(
1
))
service_operation_id
=
self
.
_service_mate
.
tickets
()[
0
].
operation_id
service_operation_id
=
self
.
_service_mate
.
tickets
()[
0
].
operation_id
self
.
_service_link
.
accept_ticket
(
links
.
Ticket
(
service_operation_id
,
0
,
None
,
None
,
links
.
Ticket
.
Subscription
.
FULL
,
None
,
1
,
None
,
None
,
None
,
None
,
None
,
None
))
self
.
_service_mate
.
block_until_tickets_satisfy
(
terminated
)
self
.
_service_mate
.
block_until_tickets_satisfy
(
terminated
)
self
.
_assert_is_valid_invocation_sequence
(
self
.
_assert_is_valid_invocation_sequence
(
...
@@ -321,7 +314,7 @@ class TransmissionTest(object):
...
@@ -321,7 +314,7 @@ class TransmissionTest(object):
invocation_terminal_metadata
,
links
.
Ticket
.
Termination
.
COMPLETION
)
invocation_terminal_metadata
,
links
.
Ticket
.
Termination
.
COMPLETION
)
original_service_ticket
=
links
.
Ticket
(
original_service_ticket
=
links
.
Ticket
(
service_operation_id
,
1
,
None
,
None
,
links
.
Ticket
.
Subscription
.
FULL
,
service_operation_id
,
0
,
None
,
None
,
links
.
Ticket
.
Subscription
.
FULL
,
timeout
,
0
,
service_initial_metadata
,
service_payload
,
timeout
,
0
,
service_initial_metadata
,
service_payload
,
service_terminal_metadata
,
service_code
,
service_message
,
service_terminal_metadata
,
service_code
,
service_message
,
links
.
Ticket
.
Termination
.
COMPLETION
)
links
.
Ticket
.
Termination
.
COMPLETION
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment