Commit ec62801a authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 99b0a979 6457394a
...@@ -556,9 +556,16 @@ sub Resolve($$) ...@@ -556,9 +556,16 @@ sub Resolve($$)
# #
# Discover resources at an authority (CM). # Discover resources at an authority (CM).
# #
sub DiscoverResources($$) sub DiscoverResources($$;$$)
{ {
my ($self, $urn) = @_; my ($self, $urn, $available, $compress) = @_;
if (! defined($available)) {
$available = 1;
}
if (! defined($compress)) {
$compress = 0;
}
my $manager_version = $self->Version(); my $manager_version = $self->Version();
return undef return undef
...@@ -586,7 +593,8 @@ sub DiscoverResources($$) ...@@ -586,7 +593,8 @@ sub DiscoverResources($$)
my $method_args; my $method_args;
if ($manager_version == 2.0) { if ($manager_version == 2.0) {
$method_args->{'credentials'} = [$credential->asString()]; $method_args->{'credentials'} = [$credential->asString()];
$method_args->{'available'} = 1; $method_args->{'available'} = $available;
$method_args->{'compress'} = $compress;
} }
else { else {
print STDERR "GeniAuthority::Discover: Unknown version at $self\n"; print STDERR "GeniAuthority::Discover: Unknown version at $self\n";
......
...@@ -14,7 +14,7 @@ use Getopt::Std; ...@@ -14,7 +14,7 @@ use Getopt::Std;
# #
sub usage() sub usage()
{ {
print "Usage: ch_daemon [-d] [-n]\n"; print "Usage: ch_daemon [-s] [-d] [-n]\n";
exit(1); exit(1);
} }
my $optlist = "dns"; my $optlist = "dns";
...@@ -183,7 +183,7 @@ sub ProbeCMs() ...@@ -183,7 +183,7 @@ sub ProbeCMs()
# Discover resources and cache; for the map client. # Discover resources and cache; for the map client.
# Returns a string of xml. # Returns a string of xml.
# #
my $resources = $authority->DiscoverResources(); my $resources = $authority->DiscoverResources(undef, 0);
# Errors will go to the log. # Errors will go to the log.
next next
if (!defined($resources)); if (!defined($resources));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment