You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Wido den Hollander <wi...@widodh.nl> on 2013/03/12 12:55:21 UTC
[ACS41] Merge Debian packaging
Hi,
In the last meeting my #action was to merge the Debian packaging commits
from master into 4.1, but I didn't get around doing so.
I found some more time to test it all and it seems the packages are
working pretty well.
The package I tested mainly was the agent package, but the others should
work as well.
Now, my problem is the cherry-picking, since I didn't do that so often
I'm looking for the easiest way to find all my commits (and from others)
so those can be cherry-picked into 4.1.
What's the easiest way to do this?
Wido
Re: [ACS41] Merge Debian packaging
Posted by Prasanna Santhanam <ts...@apache.org>.
On Wed, Mar 20, 2013 at 03:44:58PM +0530, Prasanna Santhanam wrote:
> >
> > Could you check if jna.jar is in the classpath in the init script
> > and that it also exists?
> >
> > Could you also try adding platform.jar to the classpath if that
> > doesn't work?
> >
>
> The classpath in init is /usr/share/cloudstack-agent/lib/ while yum puts
> jna.jar in /usr/share/java. I softlinked the jar to
> cloudstack-agent/lib and the agent starts up fine now. I see you've
> included /usr/share/java/jna.jar in the classpath in debian. So a
> similar solution for RPM will work too.
>
In the agent init script:
ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'`
export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
No trace of jna being in the classpath.
--
Prasanna.,
Re: [ACS41] Merge Debian packaging
Posted by Prasanna Santhanam <ts...@apache.org>.
On Tue, Mar 19, 2013 at 02:30:32PM +0100, Wido den Hollander wrote:
>
>
> On 03/19/2013 01:37 PM, Prasanna Santhanam wrote:
> >On Mon, Mar 18, 2013 at 05:11:19PM +0530, Prasanna Santhanam wrote:
> >>On Mon, Mar 18, 2013 at 12:26:30PM +0100, Wido den Hollander wrote:
> >>>Hi,
> >>>
> >>>On 03/18/2013 07:53 AM, Prasanna Santhanam wrote:
> >>>>On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
> >>>>>Hi,
> >>>>>
> >>>>>In the last meeting my #action was to merge the Debian packaging commits
> >>>>>from master into 4.1, but I didn't get around doing so.
> >>>>>
> >>>>>I found some more time to test it all and it seems the packages are
> >>>>>working pretty well.
> >>>>>
> >>>>>The package I tested mainly was the agent package, but the others should
> >>>>>work as well.
> >>>>>
> >>>>>Now, my problem is the cherry-picking, since I didn't do that so often
> >>>>>I'm looking for the easiest way to find all my commits (and from others)
> >>>>>so those can be cherry-picked into 4.1.
> >>>>>
> >>>>>What's the easiest way to do this?
> >>>>>
> >>>>>Wido
> >>>>
> >>>>Hey Wido,
> >>>>
> >>>>The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
> >>>>cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
> >>>>4.1. The dependency JNA was added to help the agent to start successfully in
> >>>>rpm artifacts.
> >>>>
> >>>>Can we just include the jna dependency back in the pom? I've reopened the bug
> >>>>and assigned it to you.
> >>>>
> >>>
> >>>No, we shouldn't need JNA via Maven at this point. Libvirt 0.4.9
> >>>should run with JNA 3.2 which is in both the Ubuntu and RHEL/CentOS.
> >>>
> >>>Running with JNA 3.5 is only required with libvirt 0.5.0 (to be
> >>>released) and runnign libvirt 0.4.9 with JNA 3.5 causes issues.
> >>>
> >>>The DEB and RPM packages should depend on JNA and you should have a
> >>>jna.jar in /usr/share/java and the init script adds that to the
> >>>Classpath.
> >>>
> >>>This works on Ubuntu and should also work in RHEL based platforms.
> >>>
> >>
> >>Jna is installed from the centos repos and it is version 3.2.4. I've installed
> >>the packages onto a centos63 VM and the cloudstack-agent process won't start.
> >>
> >>[root@apache-81-3 ~]# rpm -qa | grep virt
> >>libvirt-java-0.4.9-1.el6.noarch
> >>virt-what-1.11-1.1.el6.x86_64
> >>libvirt-client-0.10.2-18.el6.x86_64
> >>libvirt-0.10.2-18.el6.x86_64
> >>
> >>[root@apache-81-3 ~]# rpm -qa | grep jna
> >>jna-3.2.4-2.el6.x86_64
> >>
> >>[root@apache-81-3 ~]# rpm -qa | grep qemu
> >>qemu-img-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
> >>qemu-kvm-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
> >>
> >
> >Is anyone else using the agent's RPM artifacts having the problem
> >described in CLOUDSTACK-1469 or am I missing something in my
> >environment?
> >
>
> Could you check if jna.jar is in the classpath in the init script
> and that it also exists?
>
> Could you also try adding platform.jar to the classpath if that
> doesn't work?
>
The classpath in init is /usr/share/cloudstack-agent/lib/ while yum puts
jna.jar in /usr/share/java. I softlinked the jar to
cloudstack-agent/lib and the agent starts up fine now. I see you've
included /usr/share/java/jna.jar in the classpath in debian. So a
similar solution for RPM will work too.
--
Prasanna.,
Re: [ACS41] Merge Debian packaging
Posted by Wido den Hollander <wi...@widodh.nl>.
On 03/19/2013 01:37 PM, Prasanna Santhanam wrote:
> On Mon, Mar 18, 2013 at 05:11:19PM +0530, Prasanna Santhanam wrote:
>> On Mon, Mar 18, 2013 at 12:26:30PM +0100, Wido den Hollander wrote:
>>> Hi,
>>>
>>> On 03/18/2013 07:53 AM, Prasanna Santhanam wrote:
>>>> On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
>>>>> Hi,
>>>>>
>>>>> In the last meeting my #action was to merge the Debian packaging commits
>>>> >from master into 4.1, but I didn't get around doing so.
>>>>>
>>>>> I found some more time to test it all and it seems the packages are
>>>>> working pretty well.
>>>>>
>>>>> The package I tested mainly was the agent package, but the others should
>>>>> work as well.
>>>>>
>>>>> Now, my problem is the cherry-picking, since I didn't do that so often
>>>>> I'm looking for the easiest way to find all my commits (and from others)
>>>>> so those can be cherry-picked into 4.1.
>>>>>
>>>>> What's the easiest way to do this?
>>>>>
>>>>> Wido
>>>>
>>>> Hey Wido,
>>>>
>>>> The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
>>>> cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
>>>> 4.1. The dependency JNA was added to help the agent to start successfully in
>>>> rpm artifacts.
>>>>
>>>> Can we just include the jna dependency back in the pom? I've reopened the bug
>>>> and assigned it to you.
>>>>
>>>
>>> No, we shouldn't need JNA via Maven at this point. Libvirt 0.4.9
>>> should run with JNA 3.2 which is in both the Ubuntu and RHEL/CentOS.
>>>
>>> Running with JNA 3.5 is only required with libvirt 0.5.0 (to be
>>> released) and runnign libvirt 0.4.9 with JNA 3.5 causes issues.
>>>
>>> The DEB and RPM packages should depend on JNA and you should have a
>>> jna.jar in /usr/share/java and the init script adds that to the
>>> Classpath.
>>>
>>> This works on Ubuntu and should also work in RHEL based platforms.
>>>
>>
>> Jna is installed from the centos repos and it is version 3.2.4. I've installed
>> the packages onto a centos63 VM and the cloudstack-agent process won't start.
>>
>> [root@apache-81-3 ~]# rpm -qa | grep virt
>> libvirt-java-0.4.9-1.el6.noarch
>> virt-what-1.11-1.1.el6.x86_64
>> libvirt-client-0.10.2-18.el6.x86_64
>> libvirt-0.10.2-18.el6.x86_64
>>
>> [root@apache-81-3 ~]# rpm -qa | grep jna
>> jna-3.2.4-2.el6.x86_64
>>
>> [root@apache-81-3 ~]# rpm -qa | grep qemu
>> qemu-img-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
>> qemu-kvm-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
>>
>
> Is anyone else using the agent's RPM artifacts having the problem
> described in CLOUDSTACK-1469 or am I missing something in my
> environment?
>
Could you check if jna.jar is in the classpath in the init script and
that it also exists?
Could you also try adding platform.jar to the classpath if that doesn't
work?
Wido
Re: [ACS41] Merge Debian packaging
Posted by Prasanna Santhanam <ts...@apache.org>.
On Mon, Mar 18, 2013 at 05:11:19PM +0530, Prasanna Santhanam wrote:
> On Mon, Mar 18, 2013 at 12:26:30PM +0100, Wido den Hollander wrote:
> > Hi,
> >
> > On 03/18/2013 07:53 AM, Prasanna Santhanam wrote:
> > >On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
> > >>Hi,
> > >>
> > >>In the last meeting my #action was to merge the Debian packaging commits
> > >>from master into 4.1, but I didn't get around doing so.
> > >>
> > >>I found some more time to test it all and it seems the packages are
> > >>working pretty well.
> > >>
> > >>The package I tested mainly was the agent package, but the others should
> > >>work as well.
> > >>
> > >>Now, my problem is the cherry-picking, since I didn't do that so often
> > >>I'm looking for the easiest way to find all my commits (and from others)
> > >>so those can be cherry-picked into 4.1.
> > >>
> > >>What's the easiest way to do this?
> > >>
> > >>Wido
> > >
> > >Hey Wido,
> > >
> > >The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
> > >cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
> > >4.1. The dependency JNA was added to help the agent to start successfully in
> > >rpm artifacts.
> > >
> > >Can we just include the jna dependency back in the pom? I've reopened the bug
> > >and assigned it to you.
> > >
> >
> > No, we shouldn't need JNA via Maven at this point. Libvirt 0.4.9
> > should run with JNA 3.2 which is in both the Ubuntu and RHEL/CentOS.
> >
> > Running with JNA 3.5 is only required with libvirt 0.5.0 (to be
> > released) and runnign libvirt 0.4.9 with JNA 3.5 causes issues.
> >
> > The DEB and RPM packages should depend on JNA and you should have a
> > jna.jar in /usr/share/java and the init script adds that to the
> > Classpath.
> >
> > This works on Ubuntu and should also work in RHEL based platforms.
> >
>
> Jna is installed from the centos repos and it is version 3.2.4. I've installed
> the packages onto a centos63 VM and the cloudstack-agent process won't start.
>
> [root@apache-81-3 ~]# rpm -qa | grep virt
> libvirt-java-0.4.9-1.el6.noarch
> virt-what-1.11-1.1.el6.x86_64
> libvirt-client-0.10.2-18.el6.x86_64
> libvirt-0.10.2-18.el6.x86_64
>
> [root@apache-81-3 ~]# rpm -qa | grep jna
> jna-3.2.4-2.el6.x86_64
>
> [root@apache-81-3 ~]# rpm -qa | grep qemu
> qemu-img-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
> qemu-kvm-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
>
Is anyone else using the agent's RPM artifacts having the problem
described in CLOUDSTACK-1469 or am I missing something in my
environment?
--
Prasanna.,
Re: [ACS41] Merge Debian packaging
Posted by Prasanna Santhanam <ts...@apache.org>.
On Mon, Mar 18, 2013 at 12:26:30PM +0100, Wido den Hollander wrote:
> Hi,
>
> On 03/18/2013 07:53 AM, Prasanna Santhanam wrote:
> >On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
> >>Hi,
> >>
> >>In the last meeting my #action was to merge the Debian packaging commits
> >>from master into 4.1, but I didn't get around doing so.
> >>
> >>I found some more time to test it all and it seems the packages are
> >>working pretty well.
> >>
> >>The package I tested mainly was the agent package, but the others should
> >>work as well.
> >>
> >>Now, my problem is the cherry-picking, since I didn't do that so often
> >>I'm looking for the easiest way to find all my commits (and from others)
> >>so those can be cherry-picked into 4.1.
> >>
> >>What's the easiest way to do this?
> >>
> >>Wido
> >
> >Hey Wido,
> >
> >The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
> >cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
> >4.1. The dependency JNA was added to help the agent to start successfully in
> >rpm artifacts.
> >
> >Can we just include the jna dependency back in the pom? I've reopened the bug
> >and assigned it to you.
> >
>
> No, we shouldn't need JNA via Maven at this point. Libvirt 0.4.9
> should run with JNA 3.2 which is in both the Ubuntu and RHEL/CentOS.
>
> Running with JNA 3.5 is only required with libvirt 0.5.0 (to be
> released) and runnign libvirt 0.4.9 with JNA 3.5 causes issues.
>
> The DEB and RPM packages should depend on JNA and you should have a
> jna.jar in /usr/share/java and the init script adds that to the
> Classpath.
>
> This works on Ubuntu and should also work in RHEL based platforms.
>
Jna is installed from the centos repos and it is version 3.2.4. I've installed
the packages onto a centos63 VM and the cloudstack-agent process won't start.
[root@apache-81-3 ~]# rpm -qa | grep virt
libvirt-java-0.4.9-1.el6.noarch
virt-what-1.11-1.1.el6.x86_64
libvirt-client-0.10.2-18.el6.x86_64
libvirt-0.10.2-18.el6.x86_64
[root@apache-81-3 ~]# rpm -qa | grep jna
jna-3.2.4-2.el6.x86_64
[root@apache-81-3 ~]# rpm -qa | grep qemu
qemu-img-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
qemu-kvm-0.12.1.2-2.355.0.1.el6.centos.2.x86_64
--
Prasanna.,
Re: [ACS41] Merge Debian packaging
Posted by Wido den Hollander <wi...@widodh.nl>.
Hi,
On 03/18/2013 07:53 AM, Prasanna Santhanam wrote:
> On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
>> Hi,
>>
>> In the last meeting my #action was to merge the Debian packaging commits
>> from master into 4.1, but I didn't get around doing so.
>>
>> I found some more time to test it all and it seems the packages are
>> working pretty well.
>>
>> The package I tested mainly was the agent package, but the others should
>> work as well.
>>
>> Now, my problem is the cherry-picking, since I didn't do that so often
>> I'm looking for the easiest way to find all my commits (and from others)
>> so those can be cherry-picked into 4.1.
>>
>> What's the easiest way to do this?
>>
>> Wido
>
> Hey Wido,
>
> The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
> cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
> 4.1. The dependency JNA was added to help the agent to start successfully in
> rpm artifacts.
>
> Can we just include the jna dependency back in the pom? I've reopened the bug
> and assigned it to you.
>
No, we shouldn't need JNA via Maven at this point. Libvirt 0.4.9 should
run with JNA 3.2 which is in both the Ubuntu and RHEL/CentOS.
Running with JNA 3.5 is only required with libvirt 0.5.0 (to be
released) and runnign libvirt 0.4.9 with JNA 3.5 causes issues.
The DEB and RPM packages should depend on JNA and you should have a
jna.jar in /usr/share/java and the init script adds that to the Classpath.
This works on Ubuntu and should also work in RHEL based platforms.
>
> diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
> index 0639f20..62536dc 100644
> --- a/plugins/hypervisors/kvm/pom.xml
> +++ b/plugins/hypervisors/kvm/pom.xml
> @@ -43,11 +43,6 @@
> <artifactId>libvirt</artifactId>
> <version>${cs.libvirt-java.version}</version>
> </dependency>
> - <dependency>
> - <groupId>net.java.dev.jna</groupId>
> - <artifactId>jna</artifactId>
> - <version>${cs.jna.version}</version>
> - </dependency>
> </dependencies>
> <build>
> <defaultGoal>install</defaultGoal>
>
>
Re: [ACS41] Merge Debian packaging
Posted by Prasanna Santhanam <ts...@apache.org>.
On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote:
> Hi,
>
> In the last meeting my #action was to merge the Debian packaging commits
> from master into 4.1, but I didn't get around doing so.
>
> I found some more time to test it all and it seems the packages are
> working pretty well.
>
> The package I tested mainly was the agent package, but the others should
> work as well.
>
> Now, my problem is the cherry-picking, since I didn't do that so often
> I'm looking for the easiest way to find all my commits (and from others)
> so those can be cherry-picked into 4.1.
>
> What's the easiest way to do this?
>
> Wido
Hey Wido,
The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with
cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to
4.1. The dependency JNA was added to help the agent to start successfully in
rpm artifacts.
Can we just include the jna dependency back in the pom? I've reopened the bug
and assigned it to you.
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 0639f20..62536dc 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -43,11 +43,6 @@
<artifactId>libvirt</artifactId>
<version>${cs.libvirt-java.version}</version>
</dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${cs.jna.version}</version>
- </dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
--
Prasanna.,
RE: [ACS41] Merge Debian packaging
Posted by Pradeep Soundararajan <pr...@citrix.com>.
Easiest way to cherry-pick only the authors:
git log --author="Wido den Hollander"
git log --pretty=format:'Wido...%s'
Thanks,
Pradeep S
-----Original Message-----
From: Wido den Hollander [mailto:wido@widodh.nl]
Sent: Tuesday, March 12, 2013 5:25 PM
To: cloudstack-dev@incubator.apache.org
Subject: [ACS41] Merge Debian packaging
Hi,
In the last meeting my #action was to merge the Debian packaging commits from master into 4.1, but I didn't get around doing so.
I found some more time to test it all and it seems the packages are working pretty well.
The package I tested mainly was the agent package, but the others should work as well.
Now, my problem is the cherry-picking, since I didn't do that so often I'm looking for the easiest way to find all my commits (and from others) so those can be cherry-picked into 4.1.
What's the easiest way to do this?
Wido
Re: [ACS41] Merge Debian packaging
Posted by Chip Childers <ch...@sungard.com>.
On Tue, Mar 12, 2013 at 12:55:21PM +0100, Wido den Hollander wrote:
> Hi,
>
> In the last meeting my #action was to merge the Debian packaging
> commits from master into 4.1, but I didn't get around doing so.
>
> I found some more time to test it all and it seems the packages are
> working pretty well.
>
> The package I tested mainly was the agent package, but the others
> should work as well.
>
> Now, my problem is the cherry-picking, since I didn't do that so
> often I'm looking for the easiest way to find all my commits (and
> from others) so those can be cherry-picked into 4.1.
>
> What's the easiest way to do this?
>
> Wido
>
Wido,
Are all of the related changes isolated to a specific folder? If they
are, cherry-pick might not be the right tool (I think we can live with
losing the commit history, and just take the code).
So if that's the case, what I did for 4.0 docs was to generate a patch
from the diff of master and 4.0 HEADs for the docs folder, and then
applied that patch file within 4.0.
I think the same thing may work here.
On the other hand, if this does require lots of cherry-pick commits,
then grep the log for the relevant committer ID's and pull the list of
commit-sh's together (from master). I'm worried about conflicts here
though, so I'd ask that you test the cherry-pick process on a local
branch before sending me the list.
-chip