----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/11330/#review20905 -----------------------------------------------------------
This does not apply: Applying: CLOUDSTACK-2568: ACS41 regression in storage subsystem (seen with local storage and 2 or more hosts) /home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:167: space before tab in indent. String colName = ann.name(); /home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:168: space before tab in indent. for (Map.Entry<String, Attribute> attr : _attrs.entrySet()) { /home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:169: space before tab in indent. if (colName.equals(attr.getValue().columnName)) { /home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:170: space before tab in indent. set(attr.getKey()); /home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:171: space before tab in indent. return null; error: patch failed: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java:16 error: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java: patch does not apply error: patch failed: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java:49 error: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java: patch does not apply Patch failed at 0001 CLOUDSTACK-2568: ACS41 regression in storage subsystem (seen with local storage and 2 or more hosts) When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". - Chip Childers On May 22, 2013, 6:13 p.m., Prachi Damle wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/11330/ > ----------------------------------------------------------- > > (Updated May 22, 2013, 6:13 p.m.) > > > Review request for cloudstack and Chip Childers. > > > Description > ------- > > Patch created for 4.1, changes done: > - In VolumeReservationVO, the getter method of a column had a typo, causing > us to create a wrong searchbuilder. It was searching over the 'id' column > instead of 'vm_reservation_id' causing > - This bug was causing the vm deployment to choose a wrong pool during > deployment since the search was choosing incorrectly > - This bug in the GenericSearchBuilder is also fixed - if the getter method > does not use the standard 'get' or 'is' prefix, one should annotate that > method using > @Column(name = "<column_name>") and indicate which column this method refers > to. This will cause the GenericSearchBuilder to identify the field correctly. > - Also, let planner search for pools instead of selecting the one reserved - > because there is no way currently to pass multiple pool information to the > planner and this may cause issues when a VM has multiple disks. > > > This addresses bug CLOUDSTACK-2568. > > > Diffs > ----- > > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java > 6bfe953 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java > cbad9ab > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java > 4b1b1e6 > server/src/com/cloud/deploy/FirstFitPlanner.java c49d25e > utils/src/com/cloud/utils/db/GenericSearchBuilder.java 8bbe07c > > Diff: https://reviews.apache.org/r/11330/diff/ > > > Testing > ------- > > Manual testing done, also the fix has been already verified on a test > environment by the bug reporter. > > > Thanks, > > Prachi Damle > >