- Download Diff

Summary:

6516 pkgadm shouldn't use makeuuid from closed admin consolidation

Review Request #121 — Created Dec. 16, 2015 and updated June 21, 2018, 2:16 p.m.

Information
Owner:	alp
Repository:	illumos-gate
Branch:
Bugs:
Depends On:
Reviewers
Groups:	general
People:

Description

pkgadm code uses external closed makeuuid tool to generate uuids. Now when we have uuidgen in gate, it's better to replace it with uuidgen.

Testing Done

pfexec ./proto/root_i386/usr/bin/pkgadm -vvv lock -a -o aaa && echo 1
[  8109   4] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>
[  8109   4] open lock file: opened and locked fd <3>
[  8109   4] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>
[  8109   4] find lock object <aaa> key <>
[  8109   4] find lock record not found
[  8109   4] acquire exclusive lock result <-2> record <-1>
[  8109   4] acquiring exclusive lock on object <aaa>
[  8109   4] generated new unique key using date: 2702117085-1903201-0000f320827d7acf
[  8109   4] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509896> zid <0>
2702117085-1903201-0000f320827d7acf

1

We can see that keys have correct format.

Issues

0
0
3
0
All Issues: 3

Description	From	Last Updated
Rather than this whole mess of forking and execing a uuid program and then trying to parse it and falling ...	rm	Dec. 16, 2015, 4:55 p.m.
While LOCK_KEY_MAXLEN and UUID_PRINTABLE_STRING_LENGTH are the same, I would probably use UUID_PRINTABLE_STRING_LENGTH here and instead use strndup with LOCK_KEY_MAXLEN when ...	rm	March 27, 2017, 8:56 a.m.
you probably want to use UUID_PRINTABLE_STRING_LENGTH at line 2078 as well:)	tsoome	Dec. 16, 2015, 9:06 p.m.

Change Summary:

fix comment

Diff:

Revision 2 (+207 -208)

Show changes

usr/src/cmd/svr4pkg/pkgadm/lock.c

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

usr/src/cmd/svr4pkg/pkgadm/lock.c (Diff revision 2)

Show all issues

Rather than this whole mess of forking and execing a uuid program and then trying to parse it and falling back, we should just simple call uuid_generate() and uuid_unparse_lower(). It's simpler code, less forks, and less error paths.

Change Summary:

Use libuuid to generate uuids

Diff:

Revision 3 (+207 -250)

Show changes

	usr/src/cmd/svr4pkg/pkgadm/Makefile
	usr/src/cmd/svr4pkg/pkgadm/lock.c
	usr/src/cmd/svr4pkg/pkgadm/pkgadm_msgs.h

usr/src/cmd/svr4pkg/pkgadm/lock.c (Diff revision 3)

Show all issues

While LOCK_KEY_MAXLEN and UUID_PRINTABLE_STRING_LENGTH are the same, I would probably use UUID_PRINTABLE_STRING_LENGTH here and instead use strndup with LOCK_KEY_MAXLEN when doing the dup at the end.

Diff:

Revision 4 (+209 -252)

Show changes

	usr/src/cmd/svr4pkg/pkgadm/Makefile
	usr/src/cmd/svr4pkg/pkgadm/lock.c
	usr/src/cmd/svr4pkg/pkgadm/pkgadm_msgs.h

usr/src/cmd/svr4pkg/pkgadm/lock.c (Diff revision 4)

Show all issues

you probably want to use UUID_PRINTABLE_STRING_LENGTH at line 2078 as well:)

alp Dec. 16, 2015, 7:28 p.m.

I'm not sure. Intention is to use UUID_PRINTABLE_STRING_LENGTH with libuuid functions and if necessary truncate it to LOCK_KEY_MAXLEN for pkgadm functions. In fact they are the same, so it doesn't matter much.

tsoome Dec. 16, 2015, 9:06 p.m.

seems logical. well, I dont really mind:)

Testing Done:

	+	pfexec pkgadm -vvv lock -a -o aaa && echo 1# [101555 0] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>
	+
	+	[101555 0] open lock file: opened and locked fd <3>
	+
	+	[101555 0] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>
	+
	+	[101555 0] find lock object <aaa> key <>
	+
	+	[101555 0] find lock record not found
	+
	+	[101555 0] acquire exclusive lock result <-2> record <-1>
	+
	+	[101555 0] acquiring exclusive lock on object <aaa>
	+
	+	[101555 0] generated new unique key using libuuid: 6800b80c-16ce-4369-9585-a8ef841b9d65
	+
	+	[101555 0] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509384> zid <0>
	+
	+	6800b80c-16ce-4369-9585-a8ef841b9d65
	+
	+	We can see that keys have correct format.

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Change Summary:

I considered just remove makeuuid usage.

Testing Done:

~		pfexec pkgadm -vvv lock -a -o aaa && echo 1# [101555 0] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>
	~	pfexec ./proto/root_i386/usr/bin/pkgadm -vvv lock -a -o aaa && echo 1

~		[101555 0] open lock file: opened and locked fd <3>
	~	[ 8109 4] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>

~		[101555 0] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>
	~	[ 8109 4] open lock file: opened and locked fd <3>

~		[101555 0] find lock object <aaa> key <>
	~	[ 8109 4] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>

~		[101555 0] find lock record not found
	~	[ 8109 4] find lock object <aaa> key <>

~		[101555 0] acquire exclusive lock result <-2> record <-1>
	~	[ 8109 4] find lock record not found

~		[101555 0] acquiring exclusive lock on object <aaa>
	~	[ 8109 4] acquire exclusive lock result <-2> record <-1>

~		[101555 0] generated new unique key using libuuid: 6800b80c-16ce-4369-9585-a8ef841b9d65
	~	[ 8109 4] acquiring exclusive lock on object <aaa>

~		[101555 0] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509384> zid <0>
	~	[ 8109 4] generated new unique key using date: 2702117085-1903201-0000f320827d7acf

~		6800b80c-16ce-4369-9585-a8ef841b9d65
	~	[ 8109 4] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509896> zid <0>

~		We can see that keys have correct format.
	~	2702117085-1903201-0000f320827d7acf
	+	1
	+	We can see that keys have correct format.

Diff:

Revision 5 (+205 -234)

Show changes

	usr/src/cmd/svr4pkg/pkgadm/lock.c
	usr/src/cmd/svr4pkg/pkgadm/pkgadm_msgs.h

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

You have a pending review.

Review Board 3.0.18

6516 pkgadm shouldn't use makeuuid from closed admin consolidation

[ 8109 4] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>

[ 8109 4] open lock file: opened and locked fd <3>

[ 8109 4] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>

[ 8109 4] find lock object <aaa> key <>

[ 8109 4] find lock record not found

[ 8109 4] acquire exclusive lock result <-2> record <-1>

[ 8109 4] acquiring exclusive lock on object <aaa>

[ 8109 4] generated new unique key using date: 2702117085-1903201-0000f320827d7acf

[ 8109 4] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509896> zid <0>

Change Summary:

Diff:

Change Summary:

Diff:

Diff:

Testing Done:

[101555 0] open lock file: opened and locked fd <3>

[101555 0] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>

[101555 0] find lock object <aaa> key <>

[101555 0] find lock record not found

[101555 0] acquire exclusive lock result <-2> record <-1>

[101555 0] acquiring exclusive lock on object <aaa>

[101555 0] generated new unique key using libuuid: 6800b80c-16ce-4369-9585-a8ef841b9d65

[101555 0] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509384> zid <0>

Change Summary:

Testing Done:

[101555 0] open lock file: opened and locked fd <3>

[ 8109 4] open lock file root </> file </tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e>

[101555 0] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>

[ 8109 4] open lock file: opened and locked fd <3>

[101555 0] find lock object <aaa> key <>

[ 8109 4] acquire lock key=<> object=<aaa> quiet=<0> exclusive=<1>

[101555 0] find lock record not found

[ 8109 4] find lock object <aaa> key <>

[101555 0] acquire exclusive lock result <-2> record <-1>

[ 8109 4] find lock record not found

[101555 0] acquiring exclusive lock on object <aaa>

[ 8109 4] acquire exclusive lock result <-2> record <-1>

[101555 0] generated new unique key using libuuid: 6800b80c-16ce-4369-9585-a8ef841b9d65

[ 8109 4] acquiring exclusive lock on object <aaa>

[101555 0] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509384> zid <0>

[ 8109 4] generated new unique key using date: 2702117085-1903201-0000f320827d7acf

[ 8109 4] adding exclusive lock pos <0> object <(null)> key <aaa> pid <134509896> zid <0>

Diff: