[LU-7228] lustre rpm should provide lustre-client

• Status: Resolved
• Project: Lustre
• Fix Version/s: Lustre 2.8.0
• Type: Task
• Priority: Minor
• Reporter: Frank Zago (Inactive)
• Assignee: WC Triage
• Resolution: Fixed

Description

An application packaged in an rpm has to depend on either lustre or lustre-client. Since the lustre rpm also includes everything the lustre-client does, it should also provides lustre-client.

That way an application rpm only has to require lustre-client and not juggle between a lustre or lustre-client dependency.

Issue Links

• is related to: LU-5834 Lustre installation fails if lustre c...
• is related to: LU-3957 Create separate server and client bin...
• is related to: LU-3953 lustre build system improvments
• is related to: LU-8230 Remove "Provides: lustre-client"

Comments

[James A Simmons]

Is this a duplicate of LU-3957?

[Frank Zago (Inactive)]

No it's not. Sometimes our supports wants it for when lustre rpm is installed, and sometimes lustre-client is installed. With the fix I'll push, the lustre rpm will also provide lustre-client (as shown with rpm -q --provides ...) thus I won't need to have 2 different robinhood packages. This problem has aggravated me for a long time, and it's time to fix fit.

I also support LU-3957, which would be nice to have too.

[Gerrit Updater]

frank zago ([e-mail]) uploaded a new patch: http://review.whamcloud.com/16673
Subject: LU-7228 build: make lustre rpm also provide lustre-client
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: a22c43faf3c7db826fd7701d6bbef4a32561d59f

[Frank Zago (Inactive)]

After this patch, the lustre-client "provides" are still unchanged:

# rpm -qp --provides lustre-client-2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f.x86_64.rpm
config(lustre-client) = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f
liblnetconfig.so()(64bit)  
liblustreapi.so()(64bit)  
lustre-lite = 2.7.60
lustre-lite-utils = 2.7.60
lustre-client = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f
lustre-client(x86-64) = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f

The "provides" for the lustre (server) rpm now has lustre-client:

# rpm -qp --provides lustre-2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f.x86_64.rpm 
config(lustre) = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f
liblnetconfig.so()(64bit)  
liblustreapi.so()(64bit)  
lustre-client = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f
lustre-lite = 2.7.60
lustre-lite-utils = 2.7.60
lustre = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f
lustre(x86-64) = 2.7.60-2.6.32_431.20.3.el6_lustre.x86_64_ga22c43f

After a tiny change to the robinhood specfile to look for lustre-client, I can build it against either lustre or lustre-client rpm, and install it against the other one.

diff --git a/autotools/m4/lustre.m4 b/autotools/m4/lustre.m4
index 545e72e..d37eb05 100644
--- a/autotools/m4/lustre.m4
+++ b/autotools/m4/lustre.m4
@@ -7,8 +7,8 @@ AC_DEFUN([AX_LUSTRE_VERSION],
         # special m4 sequences to get square brackets in output:
         # @<:@ => [
         # @:>@ => ]
-        LVERSION=`rpm -qa "lustre@<:@-_@:>@*modules*" --qf "%{Version}\n" 2>/dev/null | tail -1 | cut -d "." -f 1-2`
-        LPACKAGE=`rpm -qa "lustre@<:@-_@:>@*modules*" --qf "%{Name}\n"  2>/dev/null | tail -1`
+        LVERSION=`rpm -qa "lustre(-client)?" --qf "%{Version}\n" 2>/dev/null | tail -1 | cut -d "." -f 1-2`
+        LPACKAGE="lustre-client"
 
         if test -z "$LVERSION"; then
             AC_MSG_RESULT(none installed)

The robinhood "requires" is now:

# rpm -q --requires robinhood-tmpfs
...
lustre-client >= 2.7
...

[Frank Zago (Inactive)]

Note that the proposed change doesn't break any existing specfile.

The only case where it might not work is when the lustre_name is passed as a parameter to rpmbuild, which the regular Lustre makefile doesn't do.

[Frank Zago (Inactive)]

This change should also be compatible when LU-3957 is completed, and both a lustre-client lustre-server rpms are created.

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch http://review.whamcloud.com/16673/
Subject: LU-7228 build: make lustre rpm also provide lustre-client
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: adce06a1c31cfd39f11353f5bbf691dbc72d8783

[Joseph Gmitter (Inactive)]

Landed for 2.8