This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new ea0b90c [TABLE SERVICE] Move grpc services from server module to
storage module
ea0b90c is described below
commit ea0b90cd9971b99be17b4e1ae9dbcd66c630daa6
Author: Sijie Guo <si...@apache.org>
AuthorDate: Wed May 23 10:56:58 2018 -0700
[TABLE SERVICE] Move grpc services from server module to storage module
Descriptions of the changes in this PR:
*Motivation*
Current almost every grpc requests are wrapped into
`StorageContainerRequest` and their responses
are wrapped into `StorageContainerResponse`. It makes things a bit
complicated on adding new grpc
services.
To simplify things, we can use grpc ClientInterceptor to stamp container
information (e.g. scId)
into the request metadata and write a grpc service registry to take the
container information from
request metadata and dispatch requests to containers.
In order to achieve it, we need to move the grpc services to storage
container.
*Solution*
This PR moves grpc services from server module to storage module, so we can
simplify the wire protocols.
Master Issue: #1205
Author: Sijie Guo <si...@apache.org>
Reviewers: Enrico Olivelli <eolive...@gmail.com>, Jia Zhai <None>
This closes #1428 from sijie/move_grpc_service_to_storage
---
.../bookkeeper/stream/server/grpc/GrpcServer.java | 3 +++
.../storage/impl}/grpc/GrpcMetaRangeService.java | 22 ++++++++++++---------
.../storage/impl}/grpc/GrpcRootRangeService.java | 23 ++++++++++++----------
.../storage/impl}/grpc/GrpcTableService.java | 10 +++++-----
.../impl/grpc}/handler/ResponseHandler.java | 2 +-
.../handler/StorageContainerResponseHandler.java | 2 +-
.../storage/impl/grpc}/handler/package-info.java | 2 +-
.../stream/storage/impl/grpc}/package-info.java | 6 +++---
.../impl}/grpc/TestGrpcMetaRangeService.java | 5 ++---
.../impl}/grpc/TestGrpcRootRangeService.java | 20 ++++++++++++++++++-
.../storage/impl}/grpc/TestGrpcTableService.java | 3 +--
.../storage/impl/grpc}/TestResponseObserver.java | 4 ++--
.../TestStorageContainerResponseHandler.java | 2 +-
13 files changed, 65 insertions(+), 39 deletions(-)
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcServer.java
b/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcServer.java
index 8ecb58a..ce95ccf 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcServer.java
+++
b/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcServer.java
@@ -27,6 +27,9 @@ import org.apache.bookkeeper.stream.proto.common.Endpoint;
import org.apache.bookkeeper.stream.server.conf.StorageServerConfiguration;
import
org.apache.bookkeeper.stream.server.exceptions.StorageServerRuntimeException;
import org.apache.bookkeeper.stream.storage.api.RangeStore;
+import org.apache.bookkeeper.stream.storage.impl.grpc.GrpcMetaRangeService;
+import org.apache.bookkeeper.stream.storage.impl.grpc.GrpcRootRangeService;
+import org.apache.bookkeeper.stream.storage.impl.grpc.GrpcTableService;
/**
* KeyRange Server.
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcMetaRangeService.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcMetaRangeService.java
similarity index 60%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcMetaRangeService.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcMetaRangeService.java
index bc42f00..1e4f681 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcMetaRangeService.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcMetaRangeService.java
@@ -1,7 +1,11 @@
/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -11,26 +15,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import io.grpc.stub.StreamObserver;
import lombok.extern.slf4j.Slf4j;
import
org.apache.bookkeeper.stream.proto.storage.MetaRangeServiceGrpc.MetaRangeServiceImplBase;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerRequest;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerResponse;
-import
org.apache.bookkeeper.stream.server.handler.StorageContainerResponseHandler;
+import
org.apache.bookkeeper.stream.storage.impl.grpc.handler.StorageContainerResponseHandler;
import org.apache.bookkeeper.stream.storage.api.RangeStore;
+import org.apache.bookkeeper.stream.storage.api.metadata.RangeStoreService;
/**
* The gRPC protocol based range service.
*/
@Slf4j
-class GrpcMetaRangeService extends MetaRangeServiceImplBase {
+public class GrpcMetaRangeService extends MetaRangeServiceImplBase {
- private final RangeStore rangeStore;
+ private final RangeStoreService rangeStore;
- GrpcMetaRangeService(RangeStore service) {
+ public GrpcMetaRangeService(RangeStore service) {
this.rangeStore = service;
log.info("Created MetaRange service");
}
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcRootRangeService.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcRootRangeService.java
similarity index 86%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcRootRangeService.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcRootRangeService.java
index 15b9910..763a221 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcRootRangeService.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcRootRangeService.java
@@ -1,7 +1,11 @@
/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -11,8 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import io.grpc.stub.StreamObserver;
import org.apache.bookkeeper.stream.proto.storage.CreateNamespaceRequest;
@@ -29,17 +32,17 @@ import
org.apache.bookkeeper.stream.proto.storage.GetStreamRequest;
import org.apache.bookkeeper.stream.proto.storage.GetStreamResponse;
import
org.apache.bookkeeper.stream.proto.storage.RootRangeServiceGrpc.RootRangeServiceImplBase;
import org.apache.bookkeeper.stream.proto.storage.StatusCode;
-import org.apache.bookkeeper.stream.server.handler.ResponseHandler;
-import org.apache.bookkeeper.stream.storage.api.RangeStore;
+import org.apache.bookkeeper.stream.storage.impl.grpc.handler.ResponseHandler;
+import org.apache.bookkeeper.stream.storage.api.metadata.RangeStoreService;
/**
* Grpc based root range service.
*/
-class GrpcRootRangeService extends RootRangeServiceImplBase {
+public class GrpcRootRangeService extends RootRangeServiceImplBase {
- private final RangeStore rs;
+ private final RangeStoreService rs;
- GrpcRootRangeService(RangeStore rs) {
+ public GrpcRootRangeService(RangeStoreService rs) {
this.rs = rs;
}
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcTableService.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcTableService.java
similarity index 88%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcTableService.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcTableService.java
index eac6daf..e86759d 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/grpc/GrpcTableService.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/GrpcTableService.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import io.grpc.stub.StreamObserver;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerRequest;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerResponse;
import
org.apache.bookkeeper.stream.proto.storage.TableServiceGrpc.TableServiceImplBase;
-import
org.apache.bookkeeper.stream.server.handler.StorageContainerResponseHandler;
-import org.apache.bookkeeper.stream.storage.api.RangeStore;
+import
org.apache.bookkeeper.stream.storage.impl.grpc.handler.StorageContainerResponseHandler;
+import org.apache.bookkeeper.stream.storage.api.metadata.RangeStoreService;
/**
* The gRPC protocol based k/v service.
@@ -31,9 +31,9 @@ import org.apache.bookkeeper.stream.storage.api.RangeStore;
@Slf4j
public class GrpcTableService extends TableServiceImplBase {
- private final RangeStore rangeStore;
+ private final RangeStoreService rangeStore;
- GrpcTableService(RangeStore store) {
+ public GrpcTableService(RangeStoreService store) {
this.rangeStore = store;
log.info("Created Table service");
}
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/ResponseHandler.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/ResponseHandler.java
similarity index 96%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/ResponseHandler.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/ResponseHandler.java
index 526076d..4707b98 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/ResponseHandler.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/ResponseHandler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.handler;
+package org.apache.bookkeeper.stream.storage.impl.grpc.handler;
import io.grpc.StatusException;
import io.grpc.StatusRuntimeException;
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/StorageContainerResponseHandler.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/StorageContainerResponseHandler.java
similarity index 96%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/StorageContainerResponseHandler.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/StorageContainerResponseHandler.java
index 5c45715..42c21a4 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/StorageContainerResponseHandler.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/StorageContainerResponseHandler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.handler;
+package org.apache.bookkeeper.stream.storage.impl.grpc.handler;
import io.grpc.stub.StreamObserver;
import org.apache.bookkeeper.stream.proto.storage.StatusCode;
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/package-info.java
similarity index 93%
copy from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
copy to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/package-info.java
index a9e9a9a..bb30bd1 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/package-info.java
@@ -19,4 +19,4 @@
/**
* Handler for processing requests and responses.
*/
-package org.apache.bookkeeper.stream.server.handler;
+package org.apache.bookkeeper.stream.storage.impl.grpc.handler;
diff --git
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/package-info.java
similarity index 82%
rename from
stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
rename to
stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/package-info.java
index a9e9a9a..2a64f22 100644
---
a/stream/server/src/main/java/org/apache/bookkeeper/stream/server/handler/package-info.java
+++
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/grpc/package-info.java
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,6 @@
*/
/**
- * Handler for processing requests and responses.
+ * Grpc services for serving requests to storage containers.
*/
-package org.apache.bookkeeper.stream.server.handler;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
\ No newline at end of file
diff --git
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcMetaRangeService.java
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcMetaRangeService.java
similarity index 96%
rename from
stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcMetaRangeService.java
rename to
stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcMetaRangeService.java
index 12e0a70..787453f 100644
---
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcMetaRangeService.java
+++
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcMetaRangeService.java
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -32,7 +32,6 @@ import
org.apache.bookkeeper.stream.proto.storage.GetActiveRangesResponse;
import org.apache.bookkeeper.stream.proto.storage.StatusCode;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerRequest;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerResponse;
-import org.apache.bookkeeper.stream.server.TestResponseObserver;
import org.apache.bookkeeper.stream.storage.impl.RangeStoreImpl;
import org.junit.Test;
diff --git
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcRootRangeService.java
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
similarity index 96%
rename from
stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcRootRangeService.java
rename to
stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
index 0d51786..7970793 100644
---
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcRootRangeService.java
+++
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
@@ -1,4 +1,22 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -12,7 +30,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import static
org.apache.bookkeeper.stream.protocol.ProtocolConstants.DEFAULT_STREAM_CONF;
import static
org.apache.bookkeeper.stream.protocol.util.ProtoUtils.createCreateNamespaceRequest;
diff --git
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcTableService.java
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcTableService.java
similarity index 99%
rename from
stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcTableService.java
rename to
stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcTableService.java
index 56833eb..ed97dc1 100644
---
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/grpc/TestGrpcTableService.java
+++
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcTableService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.grpc;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -38,7 +38,6 @@ import
org.apache.bookkeeper.stream.proto.kv.rpc.RoutingHeader;
import org.apache.bookkeeper.stream.proto.storage.StatusCode;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerRequest;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerResponse;
-import org.apache.bookkeeper.stream.server.TestResponseObserver;
import org.apache.bookkeeper.stream.storage.api.RangeStore;
import org.junit.Test;
diff --git
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/TestResponseObserver.java
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestResponseObserver.java
similarity index 96%
rename from
stream/server/src/test/java/org/apache/bookkeeper/stream/server/TestResponseObserver.java
rename to
stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestResponseObserver.java
index d1f65a3..7fae694 100644
---
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/TestResponseObserver.java
+++
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestResponseObserver.java
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server;
+package org.apache.bookkeeper.stream.storage.impl.grpc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/handler/TestStorageContainerResponseHandler.java
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/TestStorageContainerResponseHandler.java
similarity index 98%
rename from
stream/server/src/test/java/org/apache/bookkeeper/stream/server/handler/TestStorageContainerResponseHandler.java
rename to
stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/TestStorageContainerResponseHandler.java
index 696da07..cf9b917 100644
---
a/stream/server/src/test/java/org/apache/bookkeeper/stream/server/handler/TestStorageContainerResponseHandler.java
+++
b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/handler/TestStorageContainerResponseHandler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.bookkeeper.stream.server.handler;
+package org.apache.bookkeeper.stream.storage.impl.grpc.handler;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
--
To stop receiving notification emails like this one, please contact
si...@apache.org.
