Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retry fetching public ssh keys for a machine. #15872

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

hpidcock
Copy link
Member

@hpidcock hpidcock commented Jul 7, 2023

If you use juju ssh too fast after creating a machine, it may have addresses, but not yet have reported its host keys back to the controller. This allows the ssh command to wait a reasonable time for those keys.

QA steps

  • Bootstrap LXD
  • Create model config yaml file
$ cat wrench.yaml
cloudinit-userdata: |
  write_files:
  - content: |
        delay
    path: /var/lib/juju/wrench/hostkeyreporter
  • $ juju model-config wrench.yaml
  • $ juju add-machine --series jammy
  • $ juju ssh 0
  • ssh should take up to a minute to resolve, but should connect successfully or return ERROR retrieving SSH host keys for "0": keys not found

Documentation changes

N/A

Bug reference

https://jenkins.juju.canonical.com/job/test-controller-test-metrics-lxd/2/consoleText

Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we fix the use of time.sleep in the test


done := make(chan struct{})
go func() {
time.Sleep(10 * time.Second)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ick, don't like sleeping for real in tests, especially 10 seconds

@hpidcock
Copy link
Member Author

hpidcock commented Jul 7, 2023

/merge

@jujubot jujubot merged commit 9f95754 into juju:2.9 Jul 7, 2023
19 of 20 checks passed
@hpidcock hpidcock mentioned this pull request Jul 7, 2023
jujubot added a commit that referenced this pull request Jul 7, 2023
#15874

Forward ports:
- #15864
- #15870
- #15871
- #15872
- #15873

Conflicts:
- cmd/juju/commands/main.go
- cmd/juju/ssh/debugcode.go
- cmd/juju/ssh/debugcode_test.go
- cmd/juju/ssh/debughooks.go
- cmd/juju/ssh/debughooks_test.go
- cmd/juju/ssh/scp.go
- cmd/juju/ssh/scp_unix_test.go
- cmd/juju/ssh/ssh_container.go
- cmd/juju/ssh/ssh_machine.go
- cmd/juju/ssh/ssh_machine_test.go
- cmd/juju/ssh/ssh_unix_test.go
@hpidcock hpidcock mentioned this pull request Jul 7, 2023
jujubot added a commit that referenced this pull request Jul 7, 2023
@jack-w-shaw jack-w-shaw mentioned this pull request Jul 7, 2023
jujubot added a commit that referenced this pull request Jul 7, 2023
#15881

Merges:
- #15845
- #15852
- #15854
- #15849
- #15855
- #15857
- #15861
- #15862
- #15825
- #15866
- #15863
- #15870
- #15871
- #15872
- #15873
- #15874
- #15875

One substantial conflict in `cmd/juju/application/deployer/bundlehandler.go` & `cmd/juju/application/deployer/bundlehandler_test.go`, resulting in failing unit tests.

The conflict relates to this PR:
- #15825

These were fixed by the two tops commits

### QA Steps

Ensure all unit tests pass
```
go test github.com/juju/juju/cmd/juju/application/deployer
go test github.com/juju/juju/core/charm
go test github.com/juju/juju/apiserver/facades/client/application
```

Ensure we can deploy a complex bundle
```
juju deploy kubeflow
```
@hpidcock hpidcock mentioned this pull request Jul 11, 2023
jujubot added a commit that referenced this pull request Jul 11, 2023
#15896

Forward ports:
- #15845
- #15725
- #15852
- #15854
- #15849
- #15855
- #15857
- #15861
- #15862
- #15860
- #15864
- #15825
- #15866
- #15863
- #15870
- #15871
- #15872
- #15873
- #15874
- #15876
- #15875
- #15881
- #15727
- #15883
- #15884
- #15880
- #15879
- #15886
- #15887
- #15877
- #15888
- #15893
- #15894

Conflicts:
- cmd/juju/ssh/debugcode_test.go
- cmd/juju/ssh/debughooks_test.go
- cmd/juju/ssh/scp_unix_test.go
- cmd/juju/ssh/ssh_machine.go
- cmd/juju/ssh/ssh_machine_test.go
- cmd/juju/ssh/ssh_unix_test.go
- worker/dbaccessor/worker.go
- caas/kubernetes/provider/k8s_test.go
- caas/kubernetes/provider/operator_test.go
- caas/kubernetes/provider/package_test.go
- caas/kubernetes/provider/rbac.go
- cmd/juju/application/deployer/bundlehandler.go
- cmd/juju/application/deployer/bundlehandler_test.go
- cmd/jujud/agent/model/manifolds.go
- core/bundle/changes/changes.go
- worker/caasapplicationprovisioner/application.go
- worker/caasapplicationprovisioner/application_test.go
- worker/caasapplicationprovisioner/mock_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants