ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-22 22:32:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

hack in grid-manager announcements to storage-servers

Browse Source
This commit is contained in:
meejah 2018-05-19 19:17:47 -06:00
parent c76d25ed87
commit 64eb9d7c30
1 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/allmydata/client.py
View File

@ -1,4 +1,9 @@
import os, stat, time, weakref import os
import stat
import time
import weakref
import json
from allmydata import node
from base64 import urlsafe_b64encode from base64 import urlsafe_b64encode
from functools import partial from functools import partial
from errno import ENOENT, EPERM from errno import ENOENT, EPERM
@ -564,7 +569,8 @@ class _Client(node.Node, pollmixin.PollMixin):
sharetypes.append("mutable") sharetypes.append("mutable")
expiration_sharetypes = tuple(sharetypes) expiration_sharetypes = tuple(sharetypes)
ss = StorageServer(storedir, self.nodeid, ss = StorageServer(
storedir, self.nodeid,
reserved_space=reserved, reserved_space=reserved,
discard_storage=discard, discard_storage=discard,
readonly_storage=readonly, readonly_storage=readonly,
@ -573,13 +579,43 @@ class _Client(node.Node, pollmixin.PollMixin):
expiration_mode=mode, expiration_mode=mode,
expiration_override_lease_duration=o_l_d, expiration_override_lease_duration=o_l_d,
expiration_cutoff_date=cutoff_date, expiration_cutoff_date=cutoff_date,
expiration_sharetypes=expiration_sharetypes) expiration_sharetypes=expiration_sharetypes,
)
ss.setServiceParent(self) ss.setServiceParent(self)
furl_file = self.config.get_private_path("storage.furl").encode(get_filesystem_encoding()) grid_manager_certificates = []
cert_fnames = self.get_config("storage", "grid_manager_certificate_files", "")
for fname in cert_fnames.split():
fname = abspath_expanduser_unicode(fname.decode('ascii'), base=self.basedir)
if not os.path.exists(fname):
raise ValueError(
"Grid Manager certificate file '{}' doesn't exist".format(
fname
)
)
with open(fname, 'r') as f:
cert = json.load(f)
if set(cert.keys()) != {"certificate", "signature"}:
raise ValueError(
"Unknown key in Grid Manager certificate '{}'".format(
fname
)
)
grid_manager_certificates.append(cert)
# XXX we should probably verify that the certificates are
# valid and not expired, as that could be confusing for the
# storage-server operator -- but then we need the public key
# of the Grid Manager (should that go in the config too,
# then? How to handle multiple grid-managers?)
furl_file = os.path.join(self.basedir, "private", "storage.furl").encode(get_filesystem_encoding())
furl = self.tub.registerReference(ss, furlFile=furl_file) furl = self.tub.registerReference(ss, furlFile=furl_file)
ann = {"anonymous-storage-FURL": furl, ann = {
"anonymous-storage-FURL": furl,
"permutation-seed-base32": self._init_permutation_seed(ss), "permutation-seed-base32": self._init_permutation_seed(ss),
"grid-manager-certificates": grid_manager_certificates,
} }
for ic in self.introducer_clients: for ic in self.introducer_clients:
ic.publish("storage", ann, self._node_key) ic.publish("storage", ann, self._node_key)