Skip to content

Commit 90cc57d

Browse files
author
Tom McCormick
committed
fix ordering of new proto field
1 parent a355931 commit 90cc57d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package hadoop.common;
2929

3030
/**
3131
* This is the rpc request header. It is sent with every rpc call.
32-
*
32+
*
3333
* The format of RPC call is as follows:
3434
* +--------------------------------------------------------------+
3535
* | Rpc length in bytes (4 bytes int) sum of next two parts |
@@ -47,12 +47,12 @@ package hadoop.common;
4747
*/
4848
enum RpcKindProto {
4949
RPC_BUILTIN = 0; // Used for built in calls by tests
50-
RPC_WRITABLE = 1; // Use WritableRpcEngine
50+
RPC_WRITABLE = 1; // Use WritableRpcEngine
5151
RPC_PROTOCOL_BUFFER = 2; // Use ProtobufRpcEngine
5252
}
5353

5454

55-
55+
5656
/**
5757
* Used to pass through the information necessary to continue
5858
* a trace after an RPC is made. All we need is the traceid
@@ -90,13 +90,13 @@ message RpcRequestHeaderProto { // the header for the RpcRequest
9090
optional sint32 retryCount = 5 [default = -1];
9191
optional RPCTraceInfoProto traceInfo = 6; // tracing info
9292
optional RPCCallerContextProto callerContext = 7; // call context
93-
// Authorization header for passing opaque credentials or tokens
94-
optional bytes authorizationHeader = 10;
9593
optional int64 stateId = 8; // The last seen Global State ID
9694
// Alignment context info for use with routers.
9795
// The client should not interpret these bytes, but only forward bytes
9896
// received from RpcResponseHeaderProto.routerFederatedState.
9997
optional bytes routerFederatedState = 9;
98+
// Authorization header for passing opaque credentials or tokens
99+
optional bytes authorizationHeader = 10;
100100
}
101101

102102

@@ -117,12 +117,12 @@ message RpcRequestHeaderProto { // the header for the RpcRequest
117117
* | The rpc response header contains the necessary info |
118118
* +------------------------------------------------------------------+
119119
*
120-
* Note that rpc response header is also used when connection setup fails.
120+
* Note that rpc response header is also used when connection setup fails.
121121
* Ie the response looks like a rpc response with a fake callId.
122122
*/
123123
message RpcResponseHeaderProto {
124124
/**
125-
*
125+
*
126126
* RpcStastus - success or failure
127127
* The reponseHeader's errDetail, exceptionClassName and errMsg contains
128128
* further details on the error
@@ -178,7 +178,7 @@ message RpcSaslProto {
178178
RESPONSE = 4;
179179
WRAP = 5;
180180
}
181-
181+
182182
message SaslAuth {
183183
required string method = 1;
184184
required string mechanism = 2;
@@ -187,7 +187,7 @@ message RpcSaslProto {
187187
optional bytes challenge = 5;
188188
}
189189

190-
optional uint32 version = 1;
190+
optional uint32 version = 1;
191191
required SaslState state = 2;
192192
optional bytes token = 3;
193193
repeated SaslAuth auths = 4;

0 commit comments

Comments
 (0)