Skip to content

Commit

Permalink
Merge pull request #670 from apache/feature/remove-outdated-rsa-shm
Browse files Browse the repository at this point in the history
Remove broken discovery_shm implementation.
  • Loading branch information
PengZheng authored Oct 15, 2023
2 parents 3974d91 + 813bd77 commit d7a4067
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 917 deletions.
1 change: 0 additions & 1 deletion .github/workflows/coverity-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
-DBUILD_EXPERIMENTAL=ON
-DENABLE_TESTING=ON
-DRSA_JSON_RPC=ON
-DRSA_SHM=ON
-DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON
-DSHELL_BONJOUR=ON
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ jobs:
-DBUILD_EXPERIMENTAL=ON
-DENABLE_TESTING=ON
-DRSA_JSON_RPC=ON
-DRSA_SHM=ON
-DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON
-DENABLE_TESTING_ON_CI=ON
-DCMAKE_BUILD_TYPE=${{ matrix.type }}
Expand Down
5 changes: 0 additions & 5 deletions bundles/remote_services/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ if (REMOTE_SERVICE_ADMIN)
add_subdirectory(rsa_rpc_json)
add_subdirectory(remote_service_admin_shm_v2)

celix_subproject(RSA_SHM "Option to enable building the Discovery (SHM) bundle" OFF)
if (RSA_SHM)
add_subdirectory(discovery_shm)
endif ()

if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI AND BUILD_SHELL AND BUILD_SHELL_TUI AND BUILD_LOG_SERVICE AND BUILD_LAUNCHER)
add_celix_container(remote-services-dfi
LAUNCHER Celix::launcher
Expand Down
18 changes: 0 additions & 18 deletions bundles/remote_services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,10 @@ Provides a RSA implementation that uses JSON to marshal requests and HTTP as tra
| **Configuration** | `RSA_PORT`: defines the port on which the HTTP server should listen for incoming requests. Defaults to port `8888`; |
| | `ENDPOINTS`: defines the location in which service endpoints and/or proxies can be found. Defaults to `endpoints` in the current working directory |

#### Shared memory (SHM)

Provides a RSA implementation that uses shared memory for its remote method invocation. Note that this only works when all remote services are located on the same machine.

| **Bundle** | `remote_service_admin_shm.zip` |
|--|--|
| **Configuration** | `ENDPOINTS`: defines the location in which service endpoints and/or proxies can be found. Defaults to `endpoints` in the current working directory |

### Discovery

Actively discovers the presence of remote exported services and provides information about local exported services, as given by the Topology Manager, to others.

#### Shared memory (SHM) based discovery

Provides service discovery for the RSA SHM implementation.

| **Bundle** | `discovery_shm.zip` |
|--|--|
| **Configuration** | *None* |

#### Configured discovery

Provides a service discovery with preconfigured discovery endpoints, allowing a static mesh of nodes for remote service invocation to be created. The configured discovery bundle in Celix is compatible with the configured discovery implementation provided by [Amdatu Remote](https://amdatu.atlassian.net/wiki/display/AMDATUDEV/Amdatu+Remote).
Expand Down Expand Up @@ -162,11 +146,9 @@ Also the following libraries are required for building and/or using the Remote S
## RSA Bundles

* [Remote Service Admin DFI](remote_service_admin_dfi) - A Dynamic Function Interface (DFI) implementation of the RSA.
* [Remote Service Admin SHM](remote_service_admin_shm) - A shared memory implementation of the RSA.
* [Topology Manager](topology_manager) - A (scoped) RSA Topology Manager implementation.
* [Discovery Configured](discovery_configured) - A RSA Discovery implementation using static configuration (xml).
* [Discovery Etcd](discovery_etcd/README.md) - A RSA Discovery implementation using etcd.
* [Discovery SHM](discovery_shm) - A RSA Discovery implementation using shared memory.


## Notes
Expand Down
46 changes: 0 additions & 46 deletions bundles/remote_services/discovery_shm/CMakeLists.txt

This file was deleted.

164 changes: 0 additions & 164 deletions bundles/remote_services/discovery_shm/src/discovery_impl.c

This file was deleted.

53 changes: 0 additions & 53 deletions bundles/remote_services/discovery_shm/src/discovery_impl.h

This file was deleted.

Loading

0 comments on commit d7a4067

Please sign in to comment.