Skip to content

Migrate data from old vfs paths to new local volumes path.#13728

Merged
crosbymichael merged 1 commit intomoby:masterfrom
calavera:copy_old_volume_content
Jun 4, 2015
Merged

Migrate data from old vfs paths to new local volumes path.#13728
crosbymichael merged 1 commit intomoby:masterfrom
calavera:copy_old_volume_content

Conversation

@calavera
Copy link
Contributor

@calavera calavera commented Jun 3, 2015

This is a bug upgrading from Docker 1.6 to Docker 1.7.

Before:

dockercompat-before

After:

dockercompat-after

Signed-off-by: David Calavera [email protected]

@calavera calavera added status/2-code-review kind/bug Bugs are bugs. The cause may or may not be known at triage time so debugging may be needed. and removed status/0-triage labels Jun 3, 2015
@calavera calavera added this to the 1.7.0 milestone Jun 3, 2015
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this only happen if we are using the local driver?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, this is only called when there is a /var/lib/docker/vfs/dir/VOLUME_ID directory, which only happens using the local driver in versions < 1.7. After 1.7 all volumes are in /var/lib/docker/volumes.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, cool

@calavera calavera force-pushed the copy_old_volume_content branch 2 times, most recently from 2c57941 to 5243357 Compare June 4, 2015 00:03
Copy link
Contributor

Choose a reason for hiding this comment

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

That's a tricky code path: if you fail to remove, you'll try rename backup back to volumeInfo, which is now taken (L313). Maybe that's the one error path where we should only log the error?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

agreed, and fixed.

@calavera calavera force-pushed the copy_old_volume_content branch from 5243357 to c762739 Compare June 4, 2015 00:19
@icecrime
Copy link
Contributor

icecrime commented Jun 4, 2015

LGTM

@calavera calavera force-pushed the copy_old_volume_content branch from c762739 to 16a5590 Compare June 4, 2015 17:16
@crosbymichael
Copy link
Contributor

LGTM

crosbymichael added a commit that referenced this pull request Jun 4, 2015
Migrate data from old vfs paths to new local volumes path.
@crosbymichael crosbymichael merged commit b264282 into moby:master Jun 4, 2015
@calavera calavera deleted the copy_old_volume_content branch June 4, 2015 18:29
@jessfraz
Copy link
Contributor

cherry-picked

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Bugs are bugs. The cause may or may not be known at triage time so debugging may be needed. status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants