RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-20 06:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

light: remove CONFIG_MARS_SEPARATE_PORTS, always enabled

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2015-07-17 07:36:11 +02:00
parent f3838c23e8
commit 86141dea60
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/Kconfig
View File

@ -84,29 +84,6 @@ config MARS_DEFAULT_PORT
in a cluster. Therefore, this is a compiletime constant.
You may override this at insmod time via the mars_port= parameter.
config MARS_SEPARATE_PORTS
bool "use separate port numbers for traffic shaping"
depends on MARS
default y
---help---
When enabled, the following port assignments will be used:
CONFIG_MARS_DEFAULT_PORT : updates of symlinks
CONFIG_MARS_DEFAULT_PORT + 1 : replication of logfiles
CONFIG_MARS_DEFAULT_PORT + 2 : (initial) sync traffic
As a consequence, external traffic shaping may be used to
individually control the network speed for different types
of traffic.
Please don't hinder the symlink updates in any way -- they are
most vital, and they produce no mass traffic at all
(it's only some kind of meta-information traffic).
Say Y if you have a big datacenter.
Say N if you cannot afford a bigger hole in your firefall.
If unsure, say Y.
config MARS_NET_COMPAT
bool "compatibility to 0.1 series network protocol"
depends on MARS

8
kernel/sy_old/mars_light.c
View File

@ -1637,11 +1637,7 @@ int _update_file(struct mars_dent *parent, const char *switch_path, const char *
{
struct mars_rotate *rot = parent->d_private;
struct mars_global *global = rot->global;
#ifdef CONFIG_MARS_SEPARATE_PORTS
const char *tmp = path_make("%s@%s:%d", file, peer, mars_net_default_port + 1);
#else
const char *tmp = path_make("%s@%s", file, peer);
#endif
const char *argv[2] = { tmp, file };
struct copy_brick *copy = NULL;
struct key_value_pair *msg_pair = find_key(rot->msgs, "inf-fetch");
@ -4361,11 +4357,7 @@ static int make_sync(void *buf, struct mars_dent *dent)
shortcut:
/* Start copy
*/
#ifdef CONFIG_MARS_SEPARATE_PORTS
src = path_make("data-%s@%s:%d", peer, peer, mars_net_default_port + 2);
#else
src = path_make("data-%s@%s", peer, peer);
#endif
dst = path_make("data-%s", my_id());
copy_path = backskip_replace(dent->d_path, '/', true, "/copy-");