diff --git a/src/control/logging/syslog_test.go b/src/control/logging/syslog_test.go index d57ad1a8a8bf..7c1199716eb5 100644 --- a/src/control/logging/syslog_test.go +++ b/src/control/logging/syslog_test.go @@ -27,7 +27,7 @@ func TestSyslogOutput(t *testing.T) { t.Log("unable to locate journalctl -- not running this test") return } - cmd := exec.Command(journalctl, "--system") + cmd := exec.Command(journalctl, "--system", "--since", "1 minute ago") if err := cmd.Run(); err != nil { t.Log("current user does not have permissions to view system log") return diff --git a/src/control/server/mgmt_pool.go b/src/control/server/mgmt_pool.go index 5c4f3c883491..e52749161e29 100644 --- a/src/control/server/mgmt_pool.go +++ b/src/control/server/mgmt_pool.go @@ -895,6 +895,23 @@ func (svc *mgmtSvc) PoolReintegrate(ctx context.Context, req *mgmtpb.PoolReinteg if err != nil { return nil, err } + + r := ranklist.Rank(req.Rank) + + //var m *system.Membership + + m, err := svc.membership.Get(r) + if err != nil { + return nil, err + } + + if m.State&system.AvailableMemberFilter == 0 { + // invalid := make([]ranklist.Rank, 1) + invalid := []ranklist.Rank{r} + //invalid[0] = r + return nil, FaultPoolInvalidRanks(invalid) + } + req.Tierbytes = ps.Storage.PerRankTierStorage dresp, err := svc.makeLockedPoolServiceCall(ctx, drpc.MethodPoolReintegrate, req)