diff options
| author | Jay Doane <jaydoane@apache.org> | 2020-03-28 15:52:29 -0700 |
|---|---|---|
| committer | Jay Doane <jay.s.doane@gmail.com> | 2020-03-28 15:54:28 -0700 |
| commit | 7ca2ca5e87d18cb3d9a3f0568e545e8219cd3d0c (patch) | |
| tree | b80b1596e6f2958ccc70b008810daa85e9b160c3 | |
| parent | bf887c58952f5a2a6a9ba95851befd4d169c3538 (diff) | |
| download | couchdb-7ca2ca5e87d18cb3d9a3f0568e545e8219cd3d0c.tar.gz | |
Don't advertise unimplemented features
Removes the following features from the welcome message:
- reshard
- partitioned
- pluggable-storage-engines
- scheduler
Although `scheduler` at least will presumably be returned once that
feature is complete.
| -rw-r--r-- | src/couch/src/couch_server.erl | 6 | ||||
| -rw-r--r-- | src/couch_replicator/src/couch_replicator_scheduler.erl | 3 | ||||
| -rw-r--r-- | src/mem3/src/mem3_reshard.erl | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl index 909e23898..18fa3fe61 100644 --- a/src/couch/src/couch_server.erl +++ b/src/couch/src/couch_server.erl @@ -237,12 +237,6 @@ init([]) -> couch_util:set_mqd_off_heap(?MODULE), couch_util:set_process_priority(?MODULE, high), - % Mark pluggable storage engines as a supported feature - config:enable_feature('pluggable-storage-engines'), - - % Mark partitioned databases as a supported feature - config:enable_feature(partitioned), - % Mark being able to receive documents with an _access property as a supported feature config:enable_feature('access-ready'), diff --git a/src/couch_replicator/src/couch_replicator_scheduler.erl b/src/couch_replicator/src/couch_replicator_scheduler.erl index 53c040e8c..00a352bee 100644 --- a/src/couch_replicator/src/couch_replicator_scheduler.erl +++ b/src/couch_replicator/src/couch_replicator_scheduler.erl @@ -225,7 +225,8 @@ update_job_stats(JobId, Stats) -> %% gen_server functions init(_) -> - config:enable_feature('scheduler'), + % Temporarily disable on FDB, as it's not fully implemented yet + % config:enable_feature('scheduler'), EtsOpts = [named_table, {keypos, #job.id}, {read_concurrency, true}, {write_concurrency, true}], ?MODULE = ets:new(?MODULE, EtsOpts), diff --git a/src/mem3/src/mem3_reshard.erl b/src/mem3/src/mem3_reshard.erl index 620b1bc73..234670c34 100644 --- a/src/mem3/src/mem3_reshard.erl +++ b/src/mem3/src/mem3_reshard.erl @@ -213,11 +213,6 @@ reset_state() -> % Gen server functions init(_) -> - % Advertise resharding API feature only if it is not disabled - case is_disabled() of - true -> ok; - false -> config:enable_feature('reshard') - end, couch_log:notice("~p start init()", [?MODULE]), EtsOpts = [named_table, {keypos, #job.id}, {read_concurrency, true}], ?MODULE = ets:new(?MODULE, EtsOpts), |